Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75255 (Request hangs and not finish)

Author: dstogov

NEWS

@@ -14,6 +14,9 @@ PHP                                                                        NEWS
     only litespeed SAPI). (petk)
   . Fixed bug #75251 (Missing program prefix and suffix). (petk)
 
+- Opcache
+  . Fixed bug #75255 (Request hangs and not finish). (Dmitry)
+
 28 Sep 2017, PHP 7.2.0RC3
 
 - Core

ext/opcache/Optimizer/zend_inference.c

@@ -1703,6 +1703,10 @@ static int zend_infer_ranges(const zend_op_array *op_array, zend_ssa *ssa) /* {{
 			for (j = scc_var[scc]; j >= 0; j = next_scc_var[j]) {
 				if (!ssa->var_info[j].has_range) {
 					zend_inference_init_range(op_array, ssa, j, 1, ZEND_LONG_MIN, ZEND_LONG_MAX, 1);
+				} else if (ssa->vars[j].definition_phi &&
+				           ssa->vars[j].definition_phi->pi < 0) {
+					/* narrowing Phi functions first */
+					zend_ssa_range_narrowing(op_array, ssa, j, scc);
 				}
 				zend_bitset_incl(worklist, j);
 			}

ext/opcache/tests/bug75255.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Bug #75255 (Request hangs and not finish)
+--FILE--
+<?php
+function generatePlanImage() {
+    if ($abc > 5) {
+        $abc = 5;
+    }
+    for ($row = 0; $row < $abc; $row++) {
+        for ($col = 0; $col < $numCols; $col++) {
+            getPossibleRatio($abc);
+        }
+    }
+}
+?>
+DONE
+--EXPECT--
+DONE