Merge branch 'master' into v2.1

eugeneia · Nov 26, 2015 · 126e55d · 126e55d
2 parents 3a0b2a9 + 3d4c9f9
commit 126e55d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/lj_opt_split.c b/src/lj_opt_split.c
@@ -596,7 +596,8 @@ static void split_ir(jit_State *J)
 	}
 #endif
 	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;
 	} else if ((ir->op2 & IRCONV_SEXT)) {  /* Sign-extend to 64 bit. */
 	  IRRef k31 = lj_ir_kint(J, 31);