Merge branch 'master' into v2.1

(cherry picked from commit 4b17a6a)
eugeneia · Jan 17, 2018 · 91dbe23 · 91dbe23
1 parent f6c52a3
commit 91dbe23
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/lj_opt_fold.c b/src/lj_opt_fold.c
@@ -1168,7 +1168,7 @@ LJFOLDF(simplify_conv_sext)
   if (ref == J->scev.idx) {
     IRRef lo = J->scev.dir ? J->scev.start : J->scev.stop;
     lua_assert(irt_isint(J->scev.t));
-    if (lo && IR(lo)->i + ofs >= 0) {
+    if (lo && IR(lo)->o == IR_KINT && IR(lo)->i + ofs >= 0) {
     ok_reduce:
       /* Eliminate widening. All 32 bit ops do an implicit zero-extension. */
       return LEFTFOLD;