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

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2021-09-21 16:44:06 +02:00
commit e2b9797ba1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lj_trace.c
View File

@ -512,7 +512,11 @@ static void trace_stop(jit_State *J)
lj_assertJ(J->parent != 0 && J->cur.root != 0, "not a side trace"); lj_assertJ(J->parent != 0 && J->cur.root != 0, "not a side trace");
lj_asm_patchexit(J, traceref(J, J->parent), J->exitno, J->cur.mcode); lj_asm_patchexit(J, traceref(J, J->parent), J->exitno, J->cur.mcode);
/* Avoid compiling a side trace twice (stack resizing uses parent exit). */ /* Avoid compiling a side trace twice (stack resizing uses parent exit). */
traceref(J, J->parent)->snap[J->exitno].count = SNAPCOUNT_DONE; {
SnapShot *snap = &traceref(J, J->parent)->snap[J->exitno];
snap->count = SNAPCOUNT_DONE;
if (J->cur.topslot > snap->topslot) snap->topslot = J->cur.topslot;
}
/* Add to side trace chain in root trace. */ /* Add to side trace chain in root trace. */
{ {
GCtrace *root = traceref(J, J->cur.root); GCtrace *root = traceref(J, J->cur.root);