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

DUALNUM: Add missing type conversion for FORI slots.

Browse Source 
Reported by Sergey Kaplun. #1413
This commit is contained in:
Mike Pall
2025-12-06 08:35:19 +01:00
parent 34b59f8aa9
commit 406cf69b3a
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/lj_record.c
View File

@@ -307,12 +307,27 @@ static TRef fori_load(jit_State *J, BCReg slot, IRType t, int mode)
mode + conv); mode + conv);
} }
/* Convert FORI argument to expected target type. */
static TRef fori_conv(jit_State *J, TRef tr, IRType t)
{
if (t == IRT_INT) {
if (!tref_isinteger(tr))
return emitir(IRTGI(IR_CONV), tr, IRCONV_INT_NUM|IRCONV_CHECK);
} else {
if (!tref_isnum(tr))
return emitir(IRTN(IR_CONV), tr, IRCONV_NUM_INT);
}
return tr;
}
/* Peek before FORI to find a const initializer. Otherwise load from slot. */ /* Peek before FORI to find a const initializer. Otherwise load from slot. */
static TRef fori_arg(jit_State *J, const BCIns *fori, BCReg slot, static TRef fori_arg(jit_State *J, const BCIns *fori, BCReg slot,
IRType t, int mode) IRType t, int mode)
{ {
TRef tr = J->base[slot]; TRef tr = J->base[slot];
if (!tr) { if (tr) {
tr = fori_conv(J, tr, t);
} else {
tr = find_kinit(J, fori, slot, t); tr = find_kinit(J, fori, slot, t);
if (!tr) if (!tr)
tr = fori_load(J, slot, t, mode); tr = fori_load(J, slot, t, mode);
@@ -458,13 +473,7 @@ static LoopEvent rec_for(jit_State *J, const BCIns *fori, int isforl)
lua_assert(tref_isnumber_str(tr[i])); lua_assert(tref_isnumber_str(tr[i]));
if (tref_isstr(tr[i])) if (tref_isstr(tr[i]))
tr[i] = emitir(IRTG(IR_STRTO, IRT_NUM), tr[i], 0); tr[i] = emitir(IRTG(IR_STRTO, IRT_NUM), tr[i], 0);
if (t == IRT_INT) { tr[i] = fori_conv(J, tr[i], t);
if (!tref_isinteger(tr[i]))
tr[i] = emitir(IRTGI(IR_CONV), tr[i], IRCONV_INT_NUM|IRCONV_CHECK);
} else {
if (!tref_isnum(tr[i]))
tr[i] = emitir(IRTN(IR_CONV), tr[i], IRCONV_NUM_INT);
}
} }
tr[FORL_EXT] = tr[FORL_IDX]; tr[FORL_EXT] = tr[FORL_IDX];
stop = tr[FORL_STOP]; stop = tr[FORL_STOP];