From: Mike Pall <mike>
Date: Sat, 6 Dec 2025 07:38:49 +0000 (+0100)
Subject: Merge branch 'master' into v2.1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53d014fea828e67110b88ff2e89dd989b395de58;p=thirdparty%2FLuaJIT.git

Merge branch 'master' into v2.1
---

53d014fea828e67110b88ff2e89dd989b395de58
diff --cc src/lj_record.c
index 536d7171,04a37925..5c0f00d9
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@@ -531,16 -470,10 +546,10 @@@ static LoopEvent rec_for(jit_State *J, 
  						   IRT_NUM;
      for (i = FORL_IDX; i <= FORL_STEP; i++) {
        if (!tr[i]) sload(J, ra+i);
 -      lua_assert(tref_isnumber_str(tr[i]));
 +      lj_assertJ(tref_isnumber_str(tr[i]), "bad FORI argument type");
        if (tref_isstr(tr[i]))
  	tr[i] = emitir(IRTG(IR_STRTO, IRT_NUM), tr[i], 0);
-       if (t == IRT_INT) {
- 	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[i] = fori_conv(J, tr[i], t);
      }
      tr[FORL_EXT] = tr[FORL_IDX];
      stop = tr[FORL_STOP];