Add potential PHI for number conversions due to type instability, too.

1 files changed, 16 insertions, 5 deletions

diff --git a/src/lj_opt_loop.c b/src/lj_opt_loop.c
index 6dd06636..0e03205f 100644
--- a/src/lj_opt_loop.c
+++ b/src/lj_opt_loop.c
@@ -300,13 +300,24 @@ static void loop_unroll(jit_State *J)
         }
         /* Check all loop-carried dependencies for type instability. */
         if (!irt_sametype(t, irr->t)) {
-          if (irt_isnum(t) && irt_isinteger(irr->t))  /* Fix int->num. */
-            subst[ins] = tref_ref(emitir(IRTN(IR_CONV), ref, IRCONV_NUM_INT));
+          if (irt_isinteger(t) && irt_isinteger(irr->t))
+            continue;
+          else if (irt_isnum(t) && irt_isinteger(irr->t))  /* Fix int->num. */
+            ref = tref_ref(emitir(IRTN(IR_CONV), ref, IRCONV_NUM_INT));
           else if (irt_isnum(irr->t) && irt_isinteger(t))  /* Fix num->int. */
-            subst[ins] = tref_ref(emitir(IRTGI(IR_CONV), ref,
-                                         IRCONV_INT_NUM|IRCONV_CHECK));
-          else if (!(irt_isinteger(t) && irt_isinteger(irr->t)))
+            ref = tref_ref(emitir(IRTGI(IR_CONV), ref,
+                                  IRCONV_INT_NUM|IRCONV_CHECK));
+          else
             lj_trace_err(J, LJ_TRERR_TYPEINS);
+          subst[ins] = (IRRef1)ref;
+          /* May need a PHI for the CONV, too. */
+          irr = IR(ref);
+          if (ref < invar && !irref_isk(ref) && !irt_isphi(irr->t)) {
+            irt_setphi(irr->t);
+            if (nphi >= LJ_MAX_PHI)
+              lj_trace_err(J, LJ_TRERR_PHIOV);
+            phi[nphi++] = (IRRef1)ref;
+          }
         }
       }
     }