1 files changed, 9 insertions, 3 deletions

diff --git a/src/lj_record.c b/src/lj_record.c
index 9d0021a6..134fad83 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -1599,10 +1599,16 @@ TRef lj_record_idx(jit_State *J, RecordIndex *ix)
       lj_assertJ(!hasmm, "inconsistent metamethod handling");
       if (oldv == niltvg(J2G(J))) {  /* Need to insert a new key. */
         TRef key = ix->key;
-        if (tref_isinteger(key))  /* NEWREF needs a TValue as a key. */
+        if (tref_isinteger(key)) {  /* NEWREF needs a TValue as a key. */
           key = emitir(IRTN(IR_CONV), key, IRCONV_NUM_INT);
-        else if (tref_isnumber(key) && tref_isk(key) && tvismzero(&ix->keyv))
-          key = lj_ir_knum_zero(J);  /* Canonicalize -0.0 to +0.0. */
+        } else if (tref_isnum(key)) {
+          if (tref_isk(key)) {
+            if (tvismzero(&ix->keyv))
+              key = lj_ir_knum_zero(J);  /* Canonicalize -0.0 to +0.0. */
+          } else {
+            emitir(IRTG(IR_EQ, IRT_NUM), key, key);  /* Check for !NaN. */
+          }
+        }
         xref = emitir(IRT(IR_NEWREF, IRT_PGC), ix->tab, key);
         keybarrier = 0;  /* NEWREF already takes care of the key barrier. */
 #ifdef LUAJIT_ENABLE_TABLE_BUMP