diff options
author | Mike Pall <mike> | 2016-06-05 12:53:37 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2016-06-05 12:53:37 +0200 |
commit | a7bec69a7593b2887a6d1d8dd13272aa005c36fa (patch) | |
tree | d4271ce7cbfeef0e3e21b8de59fc07abc5c9da73 /src | |
parent | 32063075636d4f4017f318fc0a367dd49c730895 (diff) | |
download | luajit-a7bec69a7593b2887a6d1d8dd13272aa005c36fa.tar.gz luajit-a7bec69a7593b2887a6d1d8dd13272aa005c36fa.tar.bz2 luajit-a7bec69a7593b2887a6d1d8dd13272aa005c36fa.zip |
Fix PHI remarking in SINK pass.
Thanks to Vyacheslav Egorov.
Diffstat (limited to 'src')
-rw-r--r-- | src/lj_opt_sink.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lj_opt_sink.c b/src/lj_opt_sink.c index 975ee831..c988cdfb 100644 --- a/src/lj_opt_sink.c +++ b/src/lj_opt_sink.c | |||
@@ -153,10 +153,9 @@ static void sink_remark_phi(jit_State *J) | |||
153 | remark = 0; | 153 | remark = 0; |
154 | for (ir = IR(J->cur.nins-1); ir->o == IR_PHI; ir--) { | 154 | for (ir = IR(J->cur.nins-1); ir->o == IR_PHI; ir--) { |
155 | IRIns *irl = IR(ir->op1), *irr = IR(ir->op2); | 155 | IRIns *irl = IR(ir->op1), *irr = IR(ir->op2); |
156 | if (((irl->t.irt ^ irr->t.irt) & IRT_MARK)) | 156 | if (!((irl->t.irt ^ irr->t.irt) & IRT_MARK) && irl->prev == irr->prev) |
157 | remark = 1; | ||
158 | else if (irl->prev == irr->prev) | ||
159 | continue; | 157 | continue; |
158 | remark |= (~(irl->t.irt & irr->t.irt) & IRT_MARK); | ||
160 | irt_setmark(IR(ir->op1)->t); | 159 | irt_setmark(IR(ir->op1)->t); |
161 | irt_setmark(IR(ir->op2)->t); | 160 | irt_setmark(IR(ir->op2)->t); |
162 | } | 161 | } |