diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-07-16 20:07:51 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-07-16 20:07:51 +0300 |
| commit | 925909dc4643bb8122249b244d57131c0718cfc4 (patch) | |
| tree | ce57135e49a0f081dad04922a5758708be597bc5 | |
| parent | ae7554270f5dc4bb2bcf4e7ead0c519d98d74bd0 (diff) | |
| download | php-git-925909dc4643bb8122249b244d57131c0718cfc4.tar.gz | |
cleanup
| -rw-r--r-- | ext/opcache/jit/zend_jit_trace.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index bb0de117a9..6678b7b67b 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/ext/opcache/jit/zend_jit_trace.c @@ -2829,15 +2829,12 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par goto jit_failure; } } else if (STACK_REG(parent_stack, i) == ZREG_THIS) { + SET_STACK_REG(stack, i, ZREG_NONE); if (!zend_jit_load_this(&dasm_state, EX_NUM_TO_VAR(i))) { goto jit_failure; } } else { - if (STACK_REG(parent_stack, i) == ZREG_ZVAL_COPY_R0) { - SET_STACK_TYPE(stack, i, IS_UNKNOWN); - } else { - SET_STACK_REG(stack, i, ZREG_NONE); - } + SET_STACK_REG(stack, i, ZREG_NONE); if (!zend_jit_store_const(&dasm_state, i, STACK_REG(parent_stack, i))) { goto jit_failure; } @@ -4051,7 +4048,7 @@ done: } if ((opline->op1_type & (IS_VAR|IS_TMP_VAR)) - && STACK_REG(stack, EX_VAR_TO_NUM(opline->op1.var)) == ZREG_THIS) { + && STACK_REG(stack, EX_VAR_TO_NUM(opline->op1.var)) > ZREG_NUM) { SET_STACK_REG(stack, EX_VAR_TO_NUM(opline->op1.var), ZREG_NONE); } |