topchetoeu/tal-runtime
1
0
Fork 0
Code Pull Requests Activity

Don't modify jit_State and exit counters while in vmevent.

Browse Source 
Fixes crash with hot loop in TEXIT callback which cleared J->parent.
This commit is contained in:
Mike Pall 2010-01-28 02:30:12 +01:00
parent fb2c583cfc
commit 725da9224d
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lj_trace.c
View File

@ -540,26 +540,26 @@ void lj_trace_ins(jit_State *J)
/* Start recording a new trace. */ /* Start recording a new trace. */
static void trace_new(jit_State *J) static void trace_new(jit_State *J)
{ {
/* Only start a new trace if not inside __gc call or vmevent. */ lua_assert(J->state == LJ_TRACE_IDLE);
if (!(J2G(J)->hookmask & (HOOK_GC|HOOK_VMEVENT))) { J->state = LJ_TRACE_START;
lua_assert(J->state == LJ_TRACE_IDLE); J->fn = curr_func(J->L);
J->state = LJ_TRACE_START; J->pt = funcproto(J->fn);
J->fn = curr_func(J->L); lj_trace_ins(J);
J->pt = funcproto(J->fn);
lj_trace_ins(J);
}
} }
/* A hotcount triggered. Start recording a root trace. */ /* A hotcount triggered. Start recording a root trace. */
void LJ_FASTCALL lj_trace_hot(jit_State *J, const BCIns *pc) void LJ_FASTCALL lj_trace_hot(jit_State *J, const BCIns *pc)
{ {
lua_State *L = J->L;
L->top = curr_topL(L); /* Only called from Lua and NRESULTS is not used. */
hotcount_set(J2GG(J), pc, J->param[JIT_P_hotloop]+1); /* Reset hotcount. */ hotcount_set(J2GG(J), pc, J->param[JIT_P_hotloop]+1); /* Reset hotcount. */
J->parent = 0; /* Root trace. */ /* Only start a new trace if not inside __gc call or vmevent. */
J->exitno = 0; if (!(J2G(J)->hookmask & (HOOK_GC|HOOK_VMEVENT))) {
J->pc = pc-1; /* The interpreter bytecode PC is offset by 1. */ lua_State *L = J->L;
trace_new(J); L->top = curr_topL(L); /* Only called from Lua and NRESULTS is not used. */
J->parent = 0; /* Root trace. */
J->exitno = 0;
J->pc = pc-1; /* The interpreter bytecode PC is offset by 1. */
trace_new(J);
}
} }
/* A trace exited. Restore interpreter state and check for hot exits. */ /* A trace exited. Restore interpreter state and check for hot exits. */
@ -593,7 +593,8 @@ void * LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr)
{ /* Check for a hot exit. */ { /* Check for a hot exit. */
SnapShot *snap = &J->trace[J->parent]->snap[J->exitno]; SnapShot *snap = &J->trace[J->parent]->snap[J->exitno];
if (snap->count != SNAPCOUNT_DONE && if (!(J2G(J)->hookmask & (HOOK_GC|HOOK_VMEVENT)) &&
snap->count != SNAPCOUNT_DONE &&
++snap->count >= J->param[JIT_P_hotexit]) ++snap->count >= J->param[JIT_P_hotexit])
trace_new(J); /* Start recording a side trace. */ trace_new(J); /* Start recording a side trace. */
} }