gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2016-06-05 12:54:53 +02:00
commit a88dc57995
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lj_opt_sink.c
View File

@ -153,10 +153,9 @@ static void sink_remark_phi(jit_State *J)
remark = 0; remark = 0;
for (ir = IR(J->cur.nins-1); ir->o == IR_PHI; ir--) { for (ir = IR(J->cur.nins-1); ir->o == IR_PHI; ir--) {
IRIns *irl = IR(ir->op1), *irr = IR(ir->op2); IRIns *irl = IR(ir->op1), *irr = IR(ir->op2);
if (((irl->t.irt ^ irr->t.irt) & IRT_MARK)) if (!((irl->t.irt ^ irr->t.irt) & IRT_MARK) && irl->prev == irr->prev)
remark = 1;
else if (irl->prev == irr->prev)
continue; continue;
remark |= (~(irl->t.irt & irr->t.irt) & IRT_MARK);
irt_setmark(IR(ir->op1)->t); irt_setmark(IR(ir->op1)->t);
irt_setmark(IR(ir->op2)->t); irt_setmark(IR(ir->op2)->t);
} }