1 files changed, 21 insertions, 7 deletions

diff --git a/src/lj_meta.c b/src/lj_meta.c
index 23f11f58..48cee510 100644
--- a/src/lj_meta.c
+++ b/src/lj_meta.c
@@ -393,13 +393,27 @@ void LJ_FASTCALL lj_meta_for(lua_State *L, TValue *o)
     lj_err_msg(L, LJ_ERR_FORLIM);
   if (!(tvisnumber(o+2) || (tvisstr(o+2) && lj_str_tonumber(strV(o+2), o+2))))
     lj_err_msg(L, LJ_ERR_FORSTEP);
-#if LJ_DUALNUM
-  /* Ensure all slots are integers or all slots are numbers. */
-  if (!(tvisint(o) && tvisint(o+1) && tvisint(o+2))) {
-    if (tvisint(o)) setnumV(o, (lua_Number)intV(o));
-    if (tvisint(o+1)) setnumV(o+1, (lua_Number)intV(o+1));
-    if (tvisint(o+2)) setnumV(o+2, (lua_Number)intV(o+2));
+  if (LJ_DUALNUM) {
+    /* Ensure all slots are integers or all slots are numbers. */
+    int32_t k[3];
+    int nint = 0;
+    ptrdiff_t i;
+    for (i = 0; i <= 2; i++) {
+      if (tvisint(o+i)) {
+        k[i] = intV(o+i); nint++;
+      } else {
+        k[i] = lj_num2int(numV(o+i)); nint += ((lua_Number)k[i] == numV(o+i));
+      }
+    }
+    if (nint == 3) {  /* Narrow to integers. */
+      setintV(o, k[0]);
+      setintV(o+1, k[1]);
+      setintV(o+2, k[2]);
+    } else if (nint != 0) {  /* Widen to numbers. */
+      if (tvisint(o)) setnumV(o, (lua_Number)intV(o));
+      if (tvisint(o+1)) setnumV(o+1, (lua_Number)intV(o+1));
+      if (tvisint(o+2)) setnumV(o+2, (lua_Number)intV(o+2));
+    }
   }
-#endif
 }