gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 15:14:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle all types of errors during trace stitching.

Browse Source 
Thanks to Sergey Kaplun and Peter Cawley. #1166 #720
This commit is contained in:
Mike Pall 2024-03-10 17:29:48 +01:00
parent bcc5125a91
commit d06beb0480
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lj_ffrecord.c
View File

@ -98,6 +98,14 @@ static ptrdiff_t results_wanted(jit_State *J)
return -1; return -1;
} }
static TValue *rec_stop_stitch_cp(lua_State *L, lua_CFunction dummy, void *ud)
{
jit_State *J = (jit_State *)ud;
lj_record_stop(J, LJ_TRLINK_STITCH, 0);
UNUSED(L); UNUSED(dummy);
return NULL;
}
/* Trace stitching: add continuation below frame to start a new trace. */ /* Trace stitching: add continuation below frame to start a new trace. */
static void recff_stitch(jit_State *J) static void recff_stitch(jit_State *J)
{ {
@ -108,10 +116,7 @@ static void recff_stitch(jit_State *J)
TValue *nframe = base + 1 + LJ_FR2; TValue *nframe = base + 1 + LJ_FR2;
const BCIns *pc = frame_pc(base-1); const BCIns *pc = frame_pc(base-1);
TValue *pframe = frame_prevl(base-1); TValue *pframe = frame_prevl(base-1);
int errcode;
/* Check for this now. Throwing in lj_record_stop messes up the stack. */
if (J->cur.nsnap >= (MSize)J->param[JIT_P_maxsnap])
lj_trace_err(J, LJ_TRERR_SNAPOV);
/* Move func + args up in Lua stack and insert continuation. */ /* Move func + args up in Lua stack and insert continuation. */
memmove(&base[1], &base[-1-LJ_FR2], sizeof(TValue)*nslot); memmove(&base[1], &base[-1-LJ_FR2], sizeof(TValue)*nslot);
@ -136,13 +141,19 @@ static void recff_stitch(jit_State *J)
J->baseslot += 2 + LJ_FR2; J->baseslot += 2 + LJ_FR2;
J->framedepth++; J->framedepth++;
lj_record_stop(J, LJ_TRLINK_STITCH, 0); errcode = lj_vm_cpcall(L, NULL, J, rec_stop_stitch_cp);
/* Undo Lua stack changes. */ /* Undo Lua stack changes. */
memmove(&base[-1-LJ_FR2], &base[1], sizeof(TValue)*nslot); memmove(&base[-1-LJ_FR2], &base[1], sizeof(TValue)*nslot);
setframe_pc(base-1, pc); setframe_pc(base-1, pc);
L->base -= 2 + LJ_FR2; L->base -= 2 + LJ_FR2;
L->top -= 2 + LJ_FR2; L->top -= 2 + LJ_FR2;
if (errcode) {
if (errcode == LUA_ERRRUN)
copyTV(L, L->top-1, L->top + (1 + LJ_FR2));
lj_err_throw(L, errcode); /* Propagate errors. */
}
} }
/* Fallback handler for fast functions that are not recorded (yet). */ /* Fallback handler for fast functions that are not recorded (yet). */