com php-src: Fixed live_range removing (bug can be triggred by JIT): Zend/zend_compile.c ext/op cache/Optimizer/zend_optimizer.c

Commit: aecf9965100e704339ccc33da6a31eca84c2d926 Author: Xinchen Hui <laruence@gmail.com> Fri, 11 Aug 2017 21:56:30 +0800 Parents: e53dd027c51368ade5b65e8b18143c488f7871d8 Branches: PHP-7.2 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aecf9965100e704339ccc33da6a31eca84c2d926 Log: Fixed live_range removing (bug can be triggred by JIT) Changed paths: M Zend/zend_compile.c M ext/opcache/Optimizer/zend_optimizer.c Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index e1d7b89..42fc8cc 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(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 4b56809..dceef80 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 == 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));