Merge branch 'master' into v2.1

2016-02-10 18:53:42 +01:00
parent f547a1425e a443889677
commit 6cb38f788f
3 changed files with 3 additions and 3 deletions
--- a/src/lj_asm_ppc.h
+++ b/src/lj_asm_ppc.h
@@ -298,7 +298,7 @@ static void asm_gencall(ASMState *as, const CCallInfo *ci, IRRef *args)
 static void asm_setupresult(ASMState *as, IRIns *ir, const CCallInfo *ci)
 {
  RegSet drop = RSET_SCRATCH;
-  int hiop = ((ir+1)->o == IR_HIOP);
+  int hiop = ((ir+1)->o == IR_HIOP && !irt_isnil((ir+1)->t));
  if ((ci->flags & CCI_NOFPRCLOBBER))
    drop &= ~RSET_FPR;
  if (ra_hasreg(ir->r))