Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2015-11-26 22:26:39 +01:00
commit 126e55d416

View File

@ -596,7 +596,8 @@ static void split_ir(jit_State *J)
} }
#endif #endif
else if (st == IRT_I64 || st == IRT_U64) { /* 64/64 bit cast. */ else if (st == IRT_I64 || st == IRT_U64) { /* 64/64 bit cast. */
/* Drop cast, since assembler doesn't care. */ /* Drop cast, since assembler doesn't care. But fwd both parts. */
hi = hiref;
goto fwdlo; goto fwdlo;
} else if ((ir->op2 & IRCONV_SEXT)) { /* Sign-extend to 64 bit. */ } else if ((ir->op2 & IRCONV_SEXT)) { /* Sign-extend to 64 bit. */
IRRef k31 = lj_ir_kint(J, 31); IRRef k31 = lj_ir_kint(J, 31);