From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 16 Jul 2020 17:07:51 +0000 (+0300)
Subject: cleanup
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=925909dc4643bb8122249b244d57131c0718cfc4;p=php

cleanup
---

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);
 			}