DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid recording interference due to invocation of VM hooks.

Browse Source 
Thanks to Sergey Kaplun. #1429 #1434
This commit is contained in:
Mike Pall
2026-02-11 23:12:53 +01:00
parent eff4006837
commit ab834de8b6
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/lj_dispatch.c
View File

@@ -523,16 +523,18 @@ out:
/* Stitch a new trace. */ /* Stitch a new trace. */
void LJ_FASTCALL lj_dispatch_stitch(jit_State *J, const BCIns *pc) void LJ_FASTCALL lj_dispatch_stitch(jit_State *J, const BCIns *pc)
{ {
ERRNO_SAVE if (!(J2G(J)->hookmask & HOOK_VMEVENT)) {
lua_State *L = J->L; ERRNO_SAVE
void *cf = cframe_raw(L->cframe); lua_State *L = J->L;
const BCIns *oldpc = cframe_pc(cf); void *cf = cframe_raw(L->cframe);
setcframe_pc(cf, pc); const BCIns *oldpc = cframe_pc(cf);
/* Before dispatch, have to bias PC by 1. */ setcframe_pc(cf, pc);
L->top = L->base + cur_topslot(curr_proto(L), pc+1, cframe_multres_n(cf)); /* Before dispatch, have to bias PC by 1. */
lj_trace_stitch(J, pc-1); /* Point to the CALL instruction. */ L->top = L->base + cur_topslot(curr_proto(L), pc+1, cframe_multres_n(cf));
setcframe_pc(cf, oldpc); lj_trace_stitch(J, pc-1); /* Point to the CALL instruction. */
ERRNO_RESTORE setcframe_pc(cf, oldpc);
ERRNO_RESTORE
}
} }
#endif #endif

11
src/lj_trace.c
View File

@@ -467,7 +467,11 @@ static void trace_start(jit_State *J)
J->ktrace = 0; J->ktrace = 0;
setgcref(J->cur.startpt, obj2gco(J->pt)); setgcref(J->cur.startpt, obj2gco(J->pt));
lj_vmevent_send(J2G(J), TRACE, lj_vmevent_send_(J2G(J), TRACE,
TValue savetv = J2G(J)->tmptv;
TValue savetv2 = J2G(J)->tmptv2;
TraceNo parent = J->parent;
ExitNo exitno = J->exitno;
setstrV(V, V->top++, lj_str_newlit(V, "start")); setstrV(V, V->top++, lj_str_newlit(V, "start"));
setintV(V->top++, traceno); setintV(V->top++, traceno);
setfuncV(V, V->top++, J->fn); setfuncV(V, V->top++, J->fn);
@@ -482,6 +486,11 @@ static void trace_start(jit_State *J)
setintV(V->top++, -1); setintV(V->top++, -1);
} }
} }
,
J2G(J)->tmptv = savetv;
J2G(J)->tmptv2 = savetv2;
J->parent = parent;
J->exitno = exitno;
); );
lj_record_setup(J); lj_record_setup(J);
} }