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

Fix TDUP load forwarding after table rehash.

Browse Source 
Reported by Sergey Kaplun. #980
This commit is contained in:
Mike Pall 2023-04-16 13:26:18 +02:00
parent 96fc114a7a
commit c7db8255e1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lj_opt_mem.c
View File

@ -154,6 +154,7 @@ static TRef fwd_ahload(jit_State *J, IRRef xref)
if (ir->o == IR_TNEW || (ir->o == IR_TDUP && irref_isk(xr->op2))) { if (ir->o == IR_TNEW || (ir->o == IR_TDUP && irref_isk(xr->op2))) {
/* A NEWREF with a number key may end up pointing to the array part. /* A NEWREF with a number key may end up pointing to the array part.
** But it's referenced from HSTORE and not found in the ASTORE chain. ** But it's referenced from HSTORE and not found in the ASTORE chain.
** Or a NEWREF may rehash the table and move unrelated number keys.
** For now simply consider this a conflict without forwarding anything. ** For now simply consider this a conflict without forwarding anything.
*/ */
if (xr->o == IR_AREF) { if (xr->o == IR_AREF) {
@ -164,6 +165,11 @@ static TRef fwd_ahload(jit_State *J, IRRef xref)
goto cselim; goto cselim;
ref2 = newref->prev; ref2 = newref->prev;
} }
} else {
IRIns *key = IR(xr->op2);
if (key->o == IR_KSLOT) key = IR(key->op1);
if (irt_isnum(key->t) && J->chain[IR_NEWREF] > tab)
goto cselim;
} }
/* NEWREF inhibits CSE for HREF, and dependent FLOADs from HREFK/AREF. /* NEWREF inhibits CSE for HREF, and dependent FLOADs from HREFK/AREF.
** But the above search for conflicting stores was limited by xref. ** But the above search for conflicting stores was limited by xref.