Merge branch 'master' into v2.1

2014-05-27 15:59:20 +02:00
parent 945af491b6 49d3157e14
commit 7400e2c0cc
2 changed files with 3 additions and 1 deletions
--- a/src/lj_asm_x86.h
+++ b/src/lj_asm_x86.h
@@ -571,7 +571,7 @@ static void asm_setupresult(ASMState *as, IRIns *ir, const CCallInfo *ci)
      lua_assert(!irt_ispri(ir->t));
      ra_destreg(as, ir, RID_RET);
    }
-  } else if (LJ_32 && irt_isfp(ir->t)) {
+  } else if (LJ_32 && irt_isfp(ir->t) && !(ci->flags & CCI_CASTU64)) {
    emit_x87op(as, XI_FPOP);  /* Pop unused result from x87 st0. */
  }
 }