Merge branch 'master' into v2.1

2 files changed, 8 insertions, 0 deletions

diff --git a/src/lj_opt_mem.c b/src/lj_opt_mem.c
index 09de2f05..455b0ca6 100644
--- a/src/lj_opt_mem.c
+++ b/src/lj_opt_mem.c
@@ -186,6 +186,7 @@ static TRef fwd_ahload(jit_State *J, IRRef xref)
         fwd_aa_tab_clear(J, tab, tab)) {
       /* A NEWREF with a number key may end up pointing to the array part.
       ** But it's referenced from HSTORE and not found in the ASTORE chain.
+      ** Or a NEWREF may rehash the table and move unrelated number keys.
       ** For now simply consider this a conflict without forwarding anything.
       */
       if (xr->o == IR_AREF) {
@@ -196,6 +197,11 @@ static TRef fwd_ahload(jit_State *J, IRRef xref)
             goto cselim;
           ref2 = newref->prev;
         }
+      } else {
+        IRIns *key = IR(xr->op2);
+        if (key->o == IR_KSLOT) key = IR(key->op1);
+        if (irt_isnum(key->t) && J->chain[IR_NEWREF] > tab)
+          goto cselim;
       }
       /* NEWREF inhibits CSE for HREF, and dependent FLOADs from HREFK/AREF.
       ** But the above search for conflicting stores was limited by xref.
diff --git a/src/lj_record.c b/src/lj_record.c
index 79ee6172..b2639cbc 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -1600,6 +1600,8 @@ TRef lj_record_idx(jit_State *J, RecordIndex *ix)
         TRef key = ix->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. */
         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