From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 14 Aug 2017 09:21:07 +0000 (+0300)
Subject: Order live ranges according to "start" position
X-Git-Tag: php-7.2.0beta3~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a80e462fbdb1562ac2c3163ef2929bd229aa62db;p=php

Order live ranges according to "start" position
---

diff --git a/Zend/tests/temporary_cleaning_016.phpt b/Zend/tests/temporary_cleaning_016.phpt
new file mode 100644
index 0000000000..40d86586b1
--- /dev/null
+++ b/Zend/tests/temporary_cleaning_016.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Live ranges should be ordered according to "start" position
+--FILE--
+<?php
+set_error_handler(function($no, $msg) { throw new Exception; });
+
+try {
+    $a = [];
+    $str = "$a${"y$a$a"}y";
+} catch (Exception $e) {
+    echo "Exception\n";
+}
+?>
+DONE
+--EXPECT--
+DONE
+
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index e1d7b899b7..0772bc4f1e 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -7844,7 +7844,7 @@ static void zend_compile_encaps_list(znode *result, zend_ast *ast) /* {{{ */
 		GET_NODE(result, opline->result);
 	} else {
 		uint32_t var;
-		uint32_t range = zend_start_live_range(CG(active_op_array), rope_init_lineno);
+		uint32_t range = zend_start_live_range_ex(CG(active_op_array), rope_init_lineno);
 
 		init_opline->extended_value = j;
 		opline->opcode = ZEND_ROPE_END;