Unify Lua number to FFI integer conversions.

Phew. #1411

1 files changed, 15 insertions, 6 deletions

diff --git a/src/lj_record.c b/src/lj_record.c
index 6543f274..536d7171 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -351,9 +351,14 @@ static TRef find_kinit(jit_State *J, const BCIns *endpc, BCReg slot, IRType t)
         } else {
           cTValue *tv = proto_knumtv(J->pt, bc_d(ins));
           if (t == IRT_INT) {
-            int32_t k = numberVint(tv);
-            if (tvisint(tv) || numV(tv) == (lua_Number)k)  /* -0 is ok here. */
-              return lj_ir_kint(J, k);
+            if (tvisint(tv)) {
+              return lj_ir_kint(J, intV(tv));
+            } else {
+              int64_t i64;
+              int32_t k;
+              if (lj_num2int_check(numV(tv), i64, k))  /* -0 is ok here. */
+                return lj_ir_kint(J, k);
+            }
             return 0;  /* Type mismatch. */
           } else {
             return lj_ir_knum(J, numberVnum(tv));
@@ -1426,9 +1431,13 @@ static TRef rec_idx_key(jit_State *J, RecordIndex *ix, IRRef *rbref,
   /* Integer keys are looked up in the array part first. */
   key = ix->key;
   if (tref_isnumber(key)) {
-    int32_t k = numberVint(&ix->keyv);
-    if (!tvisint(&ix->keyv) && numV(&ix->keyv) != (lua_Number)k)
-      k = LJ_MAX_ASIZE;
+    int32_t k;
+    if (tvisint(&ix->keyv)) {
+      k = intV(&ix->keyv);
+    } else {
+      int64_t i64;
+      if (!lj_num2int_check(numV(&ix->keyv), i64, k)) k = LJ_MAX_ASIZE;
+    }
     if ((MSize)k < LJ_MAX_ASIZE) {  /* Potential array key? */
       TRef ikey = lj_opt_narrow_index(J, key);
       TRef asizeref = emitir(IRTI(IR_FLOAD), ix->tab, IRFL_TAB_ASIZE);