Merge pull request #1573 from MoarVM/fix-pea-segfaults

Fix uninitialized registers after deopt from dispatch guards
MoarVM · Oct 22, 2021 · 8c7b734 · 8c7b734
2 parents 5c6fd3b + b92ca73
commit 8c7b734
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/spesh/optimize.c b/src/spesh/optimize.c
@@ -1167,6 +1167,12 @@ MVMuint32 find_cache_offset(MVMThreadContext *tc, MVMSpeshIns *ins) {
 MVMint32 find_predeopt_index(MVMThreadContext *tc, MVMSpeshIns *ins) {
     while (ins) {
         MVMSpeshAnn *ann = ins->annotations;
+        while (ann) {
+            if (ann->type == MVM_SPESH_ANN_DEOPT_SYNTH)
+                return ann->data.deopt_idx;
+            ann = ann->next;
+        }
+        ann = ins->annotations;
         while (ann) {
             if (ann->type == MVM_SPESH_ANN_DEOPT_PRE_INS)
                 return ann->data.deopt_idx;