gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-04-19 13:33:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Protect call to lj_gc_step on trace exit

Browse Source 
When we exited from trace because of GC and need to drive GC forward we
call lj_gc_step() inside lj_trace_exit(). If we finalize some object
and error is thrown it isn't caught.

This patch adds additional protected frame to catch an error.
This commit is contained in:
Sergey Kaplun 2023-01-16 12:39:16 +03:00
parent d0e88930dd
commit c7bc715f9c
No known key found for this signature in database
GPG Key ID: B185BA8E3C0A10B9
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lj_trace.c
View File

@ -816,6 +816,18 @@ static TValue *trace_exit_cp(lua_State *L, lua_CFunction dummy, void *ud)
return NULL;
}
/* Need to protect lj_gc_step because it may throw. */
static TValue *trace_exit_gc_cp(lua_State *L, lua_CFunction dummy, void *unused)
{
/* Always catch error here and don't call error function. */
cframe_errfunc(L->cframe) = 0;
cframe_nres(L->cframe) = -2*LUAI_MAXSTACK*(int)sizeof(TValue);
lj_gc_step(L);
UNUSED(dummy);
UNUSED(unused);
return NULL;
}
#ifndef LUAJIT_DISABLE_VMEVENT
/* Push all registers from exit state. */
static void trace_exit_regs(lua_State *L, ExitState *ex)
@ -911,8 +923,12 @@ int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr)
} else if (LJ_HASPROFILE && (G(L)->hookmask & HOOK_PROFILE)) {
/* Just exit to interpreter. */
} else if (G(L)->gc.state == GCSatomic || G(L)->gc.state == GCSfinalize) {
if (!(G(L)->hookmask & HOOK_GC))
lj_gc_step(L); /* Exited because of GC: drive GC forward. */
if (!(G(L)->hookmask & HOOK_GC)) {
/* Exited because of GC: drive GC forward. */
errcode = lj_vm_cpcall(L, NULL, NULL, trace_exit_gc_cp);
if (errcode)
return -errcode; /* Return negated error code. */
}
} else {
trace_hotside(J, pc);
}