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 table unsinking in the presence of IRFL_TAB_NOMM.

Browse Source 
Reported by Sergey Kaplun. #1052
This commit is contained in:
Mike Pall 2023-08-28 22:15:42 +02:00
parent 6a3111a57f
commit 0ef51b495f
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lj_snap.c
View File

@ -796,17 +796,26 @@ static void snap_unsink(jit_State *J, GCtrace *T, ExitState *ex,
lj_tab_dup(J->L, ir_ktab(&T->ir[ir->op1])); lj_tab_dup(J->L, ir_ktab(&T->ir[ir->op1]));
settabV(J->L, o, t); settabV(J->L, o, t);
irlast = &T->ir[T->snap[snapno].ref]; irlast = &T->ir[T->snap[snapno].ref];
for (irs = ir+1; irs < irlast; irs++) for (irs = ir+1; irs < irlast; irs++) {
if (irs->r == RID_SINK && snap_sunk_store(T, ir, irs)) { if (irs->r == RID_SINK && snap_sunk_store(T, ir, irs)) {
IRIns *irk = &T->ir[irs->op1]; IRIns *irk = &T->ir[irs->op1];
TValue tmp, *val; TValue tmp, *val;
lua_assert(irs->o == IR_ASTORE || irs->o == IR_HSTORE || lua_assert(irs->o == IR_ASTORE || irs->o == IR_HSTORE ||
irs->o == IR_FSTORE); irs->o == IR_FSTORE);
if (irk->o == IR_FREF) { if (irk->o == IR_FREF) {
lua_assert(irk->op2 == IRFL_TAB_META); switch (irk->op2) {
case IRFL_TAB_META:
snap_restoreval(J, T, ex, snapno, rfilt, irs->op2, &tmp); snap_restoreval(J, T, ex, snapno, rfilt, irs->op2, &tmp);
/* NOBARRIER: The table is new (marked white). */ /* NOBARRIER: The table is new (marked white). */
setgcref(t->metatable, obj2gco(tabV(&tmp))); setgcref(t->metatable, obj2gco(tabV(&tmp)));
break;
case IRFL_TAB_NOMM:
/* Negative metamethod cache invalidated by lj_tab_set() below. */
break;
default:
lua_assert(0);
break;
}
} else { } else {
irk = &T->ir[irk->op2]; irk = &T->ir[irk->op2];
if (irk->o == IR_KSLOT) irk = &T->ir[irk->op1]; if (irk->o == IR_KSLOT) irk = &T->ir[irk->op1];
@ -821,6 +830,7 @@ static void snap_unsink(jit_State *J, GCtrace *T, ExitState *ex,
} }
} }
} }
}
} }
/* Restore interpreter state from exit state with the help of a snapshot. */ /* Restore interpreter state from exit state with the help of a snapshot. */