diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-08-14 16:59:01 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-08-14 16:59:01 +0800 |
| commit | 6445b3a68fdaa090d1fcad36d512c2efac6352fb (patch) | |
| tree | c22adb4b75bc5e3cb710ee17ac751b4a15c4d6c7 | |
| parent | 1135161b4fbcba54253fcd729a78175cf2c1a4a0 (diff) | |
| download | php-git-6445b3a68fdaa090d1fcad36d512c2efac6352fb.tar.gz | |
Revert "Fixed live_range removing (bug can be triggred by JIT)"
This reverts commit aecf9965100e704339ccc33da6a31eca84c2d926.
| -rw-r--r-- | Zend/zend_compile.c | 2 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/zend_optimizer.c | 4 |
2 files changed, 3 insertions, 3 deletions
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)); |