Merge pull request #99 from ltratt/trace_whiles

Reapply "Ensure backwards jumps get a yk_location."
ykjit · Dec 16, 2024 · c66fe57 · c66fe57
2 parents 7ced271 + c7bf29f
commit c66fe57
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/lvm.c b/src/lvm.c
@@ -1222,8 +1222,11 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
     vmfetch();
 #ifdef USE_YK
     YkLocation *ykloc = NULL;
-    if (GET_OPCODE(i) == OP_FORLOOP || GET_OPCODE(i) == OP_TFORLOOP)
+    if ((GET_OPCODE(i) == OP_FORLOOP) ||
+        (GET_OPCODE(i) == OP_TFORLOOP) ||
+        ((GET_OPCODE(i) == OP_JMP) && (GETARG_sJ(i) < 0))) {
       ykloc = &cl->p->yklocs[pcRel(pc, cl->p)];
+    }
     yk_mt_control_point(G(L)->yk_mt, ykloc);
 #endif
     #if 0