aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2015-11-26 22:26:39 +0100
committerMike Pall <mike>2015-11-26 22:26:39 +0100
commit126e55d416ad10dc9265593b73b9f322dbf9d658 (patch)
treeda46506f5979b517abfcb324873c4ea056659213
parent3a0b2a907b0168be8ef7aade95bd2ec3991fa78c (diff)
parent3d4c9f96391b38fc02536bd4147545f08ae7c1e9 (diff)
downloadluajit-126e55d416ad10dc9265593b73b9f322dbf9d658.tar.gz
luajit-126e55d416ad10dc9265593b73b9f322dbf9d658.tar.bz2
luajit-126e55d416ad10dc9265593b73b9f322dbf9d658.zip
Merge branch 'master' into v2.1
-rw-r--r--src/lj_opt_split.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lj_opt_split.c b/src/lj_opt_split.c
index 81ded6c0..4652c737 100644
--- a/src/lj_opt_split.c
+++ b/src/lj_opt_split.c
@@ -596,7 +596,8 @@ static void split_ir(jit_State *J)
596 } 596 }
597#endif 597#endif
598 else if (st == IRT_I64 || st == IRT_U64) { /* 64/64 bit cast. */ 598 else if (st == IRT_I64 || st == IRT_U64) { /* 64/64 bit cast. */
599 /* Drop cast, since assembler doesn't care. */ 599 /* Drop cast, since assembler doesn't care. But fwd both parts. */
600 hi = hiref;
600 goto fwdlo; 601 goto fwdlo;
601 } else if ((ir->op2 & IRCONV_SEXT)) { /* Sign-extend to 64 bit. */ 602 } else if ((ir->op2 & IRCONV_SEXT)) { /* Sign-extend to 64 bit. */
602 IRRef k31 = lj_ir_kint(J, 31); 603 IRRef k31 = lj_ir_kint(J, 31);