Merge pull request #1601 from MoarVM/fix_jited_return_from_native_run…

…loops Fix JITed return from nested runloops
MoarVM · Nov 15, 2021 · 64f90d4 · 64f90d4
2 parents f8addda + 8a91bf8
commit 64f90d4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/core/interp.c b/src/core/interp.c
@@ -6207,7 +6207,7 @@ void MVM_interp_run(MVMThreadContext *tc, void (*initial_invoke)(MVMThreadContex
                 /* trampoline back to this opcode */
                 cur_op -= 2;
                 MVM_jit_code_enter(tc, jc, cu);
-                if (MVM_UNLIKELY(!tc->cur_frame)) {
+                if (MVM_UNLIKELY(!tc->cur_frame || tc->stack_top->kind == MVM_CALLSTACK_RECORD_NESTED_RUNLOOP)) {
                     /* somehow unwound our top frame */
                     goto return_label;
                 }