Merge branch 'master' into v2.1

src/lj_opt_fold.c

@@ -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;
 }