From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 14 Aug 2017 08:59:01 +0000 (+0800)
Subject: Revert "Fixed live_range removing (bug can be triggred by JIT)"
X-Git-Tag: php-7.2.0beta3~14^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6445b3a68fdaa090d1fcad36d512c2efac6352fb;p=php

Revert "Fixed live_range removing (bug can be triggred by JIT)"

This reverts commit aecf9965100e704339ccc33da6a31eca84c2d926.
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 42fc8cc074..e1d7b899b7 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 + 1);
+		uint32_t range = zend_start_live_range(CG(active_op_array), rope_init_lineno);
 
 		init_opline->extended_value = j;
 		opline->opcode = ZEND_ROPE_END;
diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c
index dceef80a9e..4b56809fda 100644
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@ -558,8 +558,8 @@ void zend_optimizer_remove_live_range_ex(zend_op_array *op_array, uint32_t var,
 	uint32_t i = 0;
 
 	while (i < op_array->last_live_range) {
-		if ((op_array->live_range[i].var & ~ZEND_LIVE_MASK) == var
-			&& op_array->live_range[i].start == start) {
+		if (op_array->live_range[i].var == var
+				&& op_array->live_range[i].start == start) {
 			op_array->last_live_range--;
 			if (i < op_array->last_live_range) {
 				memmove(&op_array->live_range[i], &op_array->live_range[i+1], (op_array->last_live_range - i) * sizeof(zend_live_range));