Merge pull request #1397 from vext01/phi-type

Fix stack overflow when asking for an AOT operand's type.
ykjit · Sep 13, 2024 · 7baa208 · 7baa208
2 parents 432faf1 + 37bdeb3
commit 7baa208
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/ykllvm b/ykllvm
diff --git a/ykrt/src/compile/jitc_yk/aot_ir.rs b/ykrt/src/compile/jitc_yk/aot_ir.rs
@@ -917,6 +917,7 @@ pub(crate) enum Inst {
     },
     #[deku(id = "14")]
     Phi {
+        tyidx: TyIdx,
         #[deku(temp)]
         num_incoming: usize,
         #[deku(count = "num_incoming")]
@@ -1014,9 +1015,9 @@ impl Inst {
             Self::Store { .. } => None,
             Self::Cast { dest_tyidx, .. } => Some(m.type_(*dest_tyidx)),
             Self::Switch { .. } => None,
-            Self::Phi { incoming_vals, .. } => {
+            Self::Phi { tyidx, .. } => {
                 // Indexing cannot crash: correct PHI nodes have at least one incoming value.
-                Some(incoming_vals[0].type_(m))
+                Some(m.type_(*tyidx))
             }
             Self::IndirectCall { ftyidx, .. } => {
                 // The type of the newly-defined local is the return type of the callee.
@@ -1276,6 +1277,7 @@ impl fmt::Display for DisplayableInst<'_> {
             Inst::Phi {
                 incoming_vals,
                 incoming_bbs,
+                ..
             } => {
                 let args = incoming_bbs
                     .iter()

diff --git a/ykrt/src/compile/jitc_yk/trace_builder.rs b/ykrt/src/compile/jitc_yk/trace_builder.rs
@@ -232,6 +232,7 @@ impl TraceBuilder {
                 aot_ir::Inst::Phi {
                     incoming_bbs,
                     incoming_vals,
+                    ..
                 } => {
                     debug_assert_eq!(prevbb.as_ref().unwrap().funcidx(), bid.funcidx());
                     self.handle_phi(