From: Mike Pall <mike>
Date: Fri, 20 May 2016 18:26:39 +0000 (+0200)
Subject: Merge branch 'master' into v2.1
X-Git-Tag: v2.1.0-beta3~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=475a6ae33fc4b28d4c1c7a5f663ea933e0ccbdfd;p=thirdparty%2FLuaJIT.git

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

475a6ae33fc4b28d4c1c7a5f663ea933e0ccbdfd
diff --cc src/lj_asm_arm.h
index ff4068a3,a722a11f..c64d59e7
--- a/src/lj_asm_arm.h
+++ b/src/lj_asm_arm.h
@@@ -907,9 -960,22 +907,8 @@@ static void asm_hrefk(ASMState *as, IRI
      emit_opk(as, ARMI_ADD, dest, node, ofs, RSET_GPR);
  }
  
 -static void asm_newref(ASMState *as, IRIns *ir)
 -{
 -  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_tab_newkey];
 -  IRRef args[3];
 -  if (ir->r == RID_SINK)
 -    return;
 -  args[0] = ASMREF_L;     /* lua_State *L */
 -  args[1] = ir->op1;      /* GCtab *t     */
 -  args[2] = ASMREF_TMP1;  /* cTValue *key */
 -  asm_setupresult(as, ir, ci);  /* TValue * */
 -  asm_gencall(as, ci, args);
 -  asm_tvptr(as, ra_releasetmp(as, ASMREF_TMP1), ir->op2);
 -}
 -
  static void asm_uref(ASMState *as, IRIns *ir)
  {
-   /* NYI: Check that UREFO is still open and not aliasing a slot. */
    Reg dest = ra_dest(as, ir, RSET_GPR);
    if (irref_isk(ir->op1)) {
      GCfunc *fn = ir_kfunc(IR(ir->op1));
diff --cc src/lj_asm_mips.h
index 7bd72fda,66953aac..ecb38c5d
--- a/src/lj_asm_mips.h
+++ b/src/lj_asm_mips.h
@@@ -808,9 -777,22 +808,8 @@@ nolo
      emit_tsi(as, MIPSI_ADDU, dest, node, ra_allock(as, ofs, allow));
  }
  
 -static void asm_newref(ASMState *as, IRIns *ir)
 -{
 -  if (ir->r != RID_SINK) {
 -    const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_tab_newkey];
 -    IRRef args[3];
 -    args[0] = ASMREF_L;     /* lua_State *L */
 -    args[1] = ir->op1;      /* GCtab *t     */
 -    args[2] = ASMREF_TMP1;  /* cTValue *key */
 -    asm_setupresult(as, ir, ci);  /* TValue * */
 -    asm_gencall(as, ci, args);
 -    asm_tvptr(as, ra_releasetmp(as, ASMREF_TMP1), ir->op2);
 -  }
 -}
 -
  static void asm_uref(ASMState *as, IRIns *ir)
  {
-   /* NYI: Check that UREFO is still open and not aliasing a slot. */
    Reg dest = ra_dest(as, ir, RSET_GPR);
    if (irref_isk(ir->op1)) {
      GCfunc *fn = ir_kfunc(IR(ir->op1));
diff --cc src/lj_asm_ppc.h
index 0ebed40f,e1b0c980..4cf1649a
--- a/src/lj_asm_ppc.h
+++ b/src/lj_asm_ppc.h
@@@ -715,9 -773,22 +715,8 @@@ static void asm_hrefk(ASMState *as, IRI
    }
  }
  
 -static void asm_newref(ASMState *as, IRIns *ir)
 -{
 -  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_tab_newkey];
 -  IRRef args[3];
 -  if (ir->r == RID_SINK)
 -    return;
 -  args[0] = ASMREF_L;     /* lua_State *L */
 -  args[1] = ir->op1;      /* GCtab *t     */
 -  args[2] = ASMREF_TMP1;  /* cTValue *key */
 -  asm_setupresult(as, ir, ci);  /* TValue * */
 -  asm_gencall(as, ci, args);
 -  asm_tvptr(as, ra_releasetmp(as, ASMREF_TMP1), ir->op2);
 -}
 -
  static void asm_uref(ASMState *as, IRIns *ir)
  {
-   /* NYI: Check that UREFO is still open and not aliasing a slot. */
    Reg dest = ra_dest(as, ir, RSET_GPR);
    if (irref_isk(ir->op1)) {
      GCfunc *fn = ir_kfunc(IR(ir->op1));
diff --cc src/lj_asm_x86.h
index 66fb4403,db3e49f8..6cd3800d
--- a/src/lj_asm_x86.h
+++ b/src/lj_asm_x86.h
@@@ -1155,9 -1178,43 +1155,8 @@@ static void asm_hrefk(ASMState *as, IRI
  #endif
  }
  
 -static void asm_newref(ASMState *as, IRIns *ir)
 -{
 -  const CCallInfo *ci = &lj_ir_callinfo[IRCALL_lj_tab_newkey];
 -  IRRef args[3];
 -  IRIns *irkey;
 -  Reg tmp;
 -  if (ir->r == RID_SINK)
 -    return;
 -  args[0] = ASMREF_L;     /* lua_State *L */
 -  args[1] = ir->op1;      /* GCtab *t     */
 -  args[2] = ASMREF_TMP1;  /* cTValue *key */
 -  asm_setupresult(as, ir, ci);  /* TValue * */
 -  asm_gencall(as, ci, args);
 -  tmp = ra_releasetmp(as, ASMREF_TMP1);
 -  irkey = IR(ir->op2);
 -  if (irt_isnum(irkey->t)) {
 -    /* For numbers use the constant itself or a spill slot as a TValue. */
 -    if (irref_isk(ir->op2))
 -      emit_loada(as, tmp, ir_knum(irkey));
 -    else
 -      emit_rmro(as, XO_LEA, tmp|REX_64, RID_ESP, ra_spill(as, irkey));
 -  } else {
 -    /* Otherwise use g->tmptv to hold the TValue. */
 -    if (!irref_isk(ir->op2)) {
 -      Reg src = ra_alloc1(as, ir->op2, rset_exclude(RSET_GPR, tmp));
 -      emit_movtomro(as, REX_64IR(irkey, src), tmp, 0);
 -    } else if (!irt_ispri(irkey->t)) {
 -      emit_movmroi(as, tmp, 0, irkey->i);
 -    }
 -    if (!(LJ_64 && irt_islightud(irkey->t)))
 -      emit_movmroi(as, tmp, 4, irt_toitype(irkey->t));
 -    emit_loada(as, tmp, &J2G(as->J)->tmptv);
 -  }
 -}
 -
  static void asm_uref(ASMState *as, IRIns *ir)
  {
-   /* NYI: Check that UREFO is still open and not aliasing a slot. */
    Reg dest = ra_dest(as, ir, RSET_GPR);
    if (irref_isk(ir->op1)) {
      GCfunc *fn = ir_kfunc(IR(ir->op1));
diff --cc src/lj_record.c
index 8a72b0c9,44b3667f..568b73aa
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@@ -1546,8 -1349,11 +1547,11 @@@ noconstify
  	uvval(uvp) < tvref(J->L->maxstack)) {
        int32_t slot = (int32_t)(uvval(uvp) - (J->L->base - J->baseslot));
        if (slot >= 0) {  /* Aliases an SSA slot? */
+ 	emitir(IRTG(IR_EQ, IRT_P32),
+ 	       REF_BASE,
+ 	       emitir(IRT(IR_ADD, IRT_P32), uref,
 -		      lj_ir_kint(J, (slot - 1) * -8)));
++		      lj_ir_kint(J, (slot - 1 - LJ_FR2) * -8)));
  	slot -= (int32_t)J->baseslot;  /* Note: slot number may be negative! */
- 	/* NYI: add IR to guard that it's still aliasing the same slot. */
  	if (val == 0) {
  	  return getslot(J, slot);
  	} else {