Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2014-01-05 16:58:30 +01:00
commit ba9dde2ce6

View File

@ -1859,7 +1859,8 @@ LJFOLD(ABC any any)
LJFOLDF(abc_invar)
{
/* Invariant ABC marked as PTR. Drop if op1 is invariant, too. */
if (!irt_isint(fins->t) && fins->op1 < J->chain[IR_LOOP])
if (!irt_isint(fins->t) && fins->op1 < J->chain[IR_LOOP] &&
!irt_isphi(IR(fins->op1)->t))
return DROPFOLD;
return NEXTFOLD;
}