Fixed live_range removing (bug can be triggred by JIT)

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index e1d7b899b7497214538155ffe7ee0746e1cbb0f5..42fc8cc074535d199ceb8ec2e751fd392f618580 100644 (file)
--- 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(CG(active_op_array), rope_init_lineno + 1);
 
                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 4b56809fda0086d17b23181b003cc90941e5a5c5..dceef80a9ea144aa2dddd203a21f20794f176a10 100644 (file)
--- 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 == var
-                               && op_array->live_range[i].start == start) {
+               if ((op_array->live_range[i].var & ~ZEND_LIVE_MASK) == 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));