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

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2023-12-23 19:15:57 +01:00
commit e02a207909
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lj_opt_mem.c
View File

@ -217,25 +217,23 @@ static TRef fwd_ahload(jit_State *J, IRRef xref)
} }
ref = store->prev; ref = store->prev;
} }
if (ir->o == IR_TNEW && !irt_isnil(fins->t)) /* Simplified here: let loop_unroll() figure out any type instability. */
return 0; /* Type instability in loop-carried dependency. */ if (ir->o == IR_TNEW) {
if (irt_ispri(fins->t)) { return TREF_NIL;
return TREF_PRI(irt_type(fins->t)); } else {
} else if (irt_isnum(fins->t) || (LJ_DUALNUM && irt_isint(fins->t)) ||
irt_isstr(fins->t)) {
TValue keyv; TValue keyv;
cTValue *tv; cTValue *tv;
IRIns *key = IR(xr->op2); IRIns *key = IR(xr->op2);
if (key->o == IR_KSLOT) key = IR(key->op1); if (key->o == IR_KSLOT) key = IR(key->op1);
lj_ir_kvalue(J->L, &keyv, key); lj_ir_kvalue(J->L, &keyv, key);
tv = lj_tab_get(J->L, ir_ktab(IR(ir->op1)), &keyv); tv = lj_tab_get(J->L, ir_ktab(IR(ir->op1)), &keyv);
if (itype2irt(tv) != irt_type(fins->t)) if (tvispri(tv))
return 0; /* Type instability in loop-carried dependency. */ return TREF_PRI(itype2irt(tv));
if (irt_isnum(fins->t)) else if (tvisnum(tv))
return lj_ir_knum_u64(J, tv->u64); return lj_ir_knum_u64(J, tv->u64);
else if (LJ_DUALNUM && irt_isint(fins->t)) else if (tvisint(tv))
return lj_ir_kint(J, intV(tv)); return lj_ir_kint(J, intV(tv));
else else if (tvisgcv(tv))
return lj_ir_kstr(J, strV(tv)); return lj_ir_kstr(J, strV(tv));
} }
/* Othwerwise: don't intern as a constant. */ /* Othwerwise: don't intern as a constant. */