DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall
2023-04-16 13:29:58 +02:00
parent 505e2c03de c7db8255e1
commit 8bbd58e534
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lj_opt_mem.c
View File

@@ -186,6 +186,7 @@ static TRef fwd_ahload(jit_State *J, IRRef xref)
fwd_aa_tab_clear(J, tab, tab)) {
/* 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.
** Or a NEWREF may rehash the table and move unrelated number keys.
** For now simply consider this a conflict without forwarding anything.
*/
if (xr->o == IR_AREF) {
@@ -196,6 +197,11 @@ static TRef fwd_ahload(jit_State *J, IRRef xref)
goto cselim;
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.
** But the above search for conflicting stores was limited by xref.