gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-03-14 22:35:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid unpatching bytecode twice after a trace flush.

Browse Source 
Reported by Sergey Kaplun. #1345
This commit is contained in:
Mike Pall 2025-03-09 23:04:23 +01:00
parent d508715ab6
commit 85c3f2fb6f
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lj_trace.c
View File

@ -205,14 +205,6 @@ static void trace_unpatch(jit_State *J, GCtrace *T)
lua_assert(op == BC_ITERL || op == BC_LOOP || bc_isret(op)); lua_assert(op == BC_ITERL || op == BC_LOOP || bc_isret(op));
*pc = T->startins; *pc = T->startins;
break; break;
case BC_JMP:
lua_assert(op == BC_ITERL);
pc += bc_j(*pc)+2;
if (bc_op(*pc) == BC_JITERL) {
lua_assert(traceref(J, bc_d(*pc)) == T);
*pc = T->startins;
}
break;
case BC_JFUNCF: case BC_JFUNCF:
lua_assert(op == BC_FUNCF); lua_assert(op == BC_FUNCF);
*pc = T->startins; *pc = T->startins;
@ -227,18 +219,19 @@ static void trace_flushroot(jit_State *J, GCtrace *T)
{ {
GCproto *pt = &gcref(T->startpt)->pt; GCproto *pt = &gcref(T->startpt)->pt;
lua_assert(T->root == 0 && pt != NULL); lua_assert(T->root == 0 && pt != NULL);
/* First unpatch any modified bytecode. */
trace_unpatch(J, T);
/* Unlink root trace from chain anchored in prototype. */ /* Unlink root trace from chain anchored in prototype. */
if (pt->trace == T->traceno) { /* Trace is first in chain. Easy. */ if (pt->trace == T->traceno) { /* Trace is first in chain. Easy. */
pt->trace = T->nextroot; pt->trace = T->nextroot;
unpatch:
/* Unpatch modified bytecode only if the trace has not been flushed. */
trace_unpatch(J, T);
} else if (pt->trace) { /* Otherwise search in chain of root traces. */ } else if (pt->trace) { /* Otherwise search in chain of root traces. */
GCtrace *T2 = traceref(J, pt->trace); GCtrace *T2 = traceref(J, pt->trace);
if (T2) { if (T2) {
for (; T2->nextroot; T2 = traceref(J, T2->nextroot)) for (; T2->nextroot; T2 = traceref(J, T2->nextroot))
if (T2->nextroot == T->traceno) { if (T2->nextroot == T->traceno) {
T2->nextroot = T->nextroot; /* Unlink from chain. */ T2->nextroot = T->nextroot; /* Unlink from chain. */
break; goto unpatch;
} }
} }
} }