q98/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 2026-07-25 20:55:26 +02:00
commit a471ab78c7
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lj_crecord.c
View File

@ -1395,7 +1395,7 @@ static TRef crec_arith_int64(jit_State *J, TRef *sp, CType **s, MMS mm)
sp[i] = emitconv(sp[i], dt, st, IRCONV_ANY); sp[i] = emitconv(sp[i], dt, st, IRCONV_ANY);
else if (!(st == IRT_I64 || st == IRT_U64)) else if (!(st == IRT_I64 || st == IRT_U64))
sp[i] = emitconv(sp[i], dt, IRT_INT, sp[i] = emitconv(sp[i], dt, IRT_INT,
(s[i]->info & CTF_UNSIGNED) ? 0 : IRCONV_SEXT); ((st - IRT_I8) & 1) ? 0 : IRCONV_SEXT);
} }
if (mm < MM_add) { if (mm < MM_add) {
comp: comp:

4
src/lj_opt_fold.c
View File

@ -1144,14 +1144,10 @@ LJFOLDF(simplify_conv_i64_num)
fins->op2 = ((IRT_I64<<5)|IRT_INT|IRCONV_SEXT); fins->op2 = ((IRT_I64<<5)|IRT_INT|IRCONV_SEXT);
return RETRYFOLD; return RETRYFOLD;
} else if ((fleft->op2 & IRCONV_SRCMASK) == IRT_U32) { } else if ((fleft->op2 & IRCONV_SRCMASK) == IRT_U32) {
#if LJ_TARGET_X64
return fleft->op1;
#else
/* Reduce to a zero-extension. */ /* Reduce to a zero-extension. */
fins->op1 = fleft->op1; fins->op1 = fleft->op1;
fins->op2 = (IRT_I64<<5)|IRT_U32; fins->op2 = (IRT_I64<<5)|IRT_U32;
return RETRYFOLD; return RETRYFOLD;
#endif
} }
return NEXTFOLD; return NEXTFOLD;
} }