summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2015-01-17 14:50:41 +0100
committerMike Pall <mike>2015-01-17 14:50:41 +0100
commit7f013005f61b82300d4ec591fd4cec59a74d62ff (patch)
tree4264fe8d3c04df3e3fabc99107c6d404f204b97f
parentb876d6dadaaff8f1deb91c54513a1e59e40b2ef2 (diff)
downloadluajit-7f013005f61b82300d4ec591fd4cec59a74d62ff.tar.gz
luajit-7f013005f61b82300d4ec591fd4cec59a74d62ff.tar.bz2
luajit-7f013005f61b82300d4ec591fd4cec59a74d62ff.zip
Don't compile IR_RETF after CALLT to ff with-side effects.
-rw-r--r--src/lj_record.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lj_record.c b/src/lj_record.c
index 19f17639..843108c8 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -745,6 +745,8 @@ void lj_record_ret(jit_State *J, BCReg rbase, ptrdiff_t gotresults)
745 } else if (J->parent == 0 && !bc_isret(bc_op(J->cur.startins))) { 745 } else if (J->parent == 0 && !bc_isret(bc_op(J->cur.startins))) {
746 /* Return to lower frame would leave the loop in a root trace. */ 746 /* Return to lower frame would leave the loop in a root trace. */
747 lj_trace_err(J, LJ_TRERR_LLEAVE); 747 lj_trace_err(J, LJ_TRERR_LLEAVE);
748 } else if (J->needsnap) { /* Tailcalled to ff with side-effects. */
749 lj_trace_err(J, LJ_TRERR_NYIRETL); /* No way to insert snapshot here. */
748 } else { /* Return to lower frame. Guard for the target we return to. */ 750 } else { /* Return to lower frame. Guard for the target we return to. */
749 TRef trpt = lj_ir_kgc(J, obj2gco(pt), IRT_PROTO); 751 TRef trpt = lj_ir_kgc(J, obj2gco(pt), IRT_PROTO);
750 TRef trpc = lj_ir_kptr(J, (void *)frame_pc(frame)); 752 TRef trpc = lj_ir_kptr(J, (void *)frame_pc(frame));