From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 29 Jul 2020 11:58:41 +0000 (+0300)
Subject: Temporary disable abstract test usage for inferring previous type of variables (previ... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ef0ea581016e1baa6ee7a9ef378cefe0f110a7a;p=php

Temporary disable abstract test usage for inferring previous type of variables (previous value may be in CPU register and type of the stack slot may be inconsistent).
---

diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
index 063e650cfd..71adacaa0c 100644
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -3128,7 +3128,11 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 							if (opline->result_type == IS_CV) {
 								res_use_info = RES_USE_INFO();
 							} else {
+#if USE_ABSTRACT_STACK_FOR_RES_USE_INFO
 								res_use_info = zend_jit_trace_type_to_info(STACK_VAR_TYPE(opline->result.var));
+#else
+								res_use_info = -1;
+#endif
 							}
 							res_info = RES_INFO();
 							res_addr = RES_REG_ADDR();
@@ -3203,7 +3207,11 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 							if (opline->result_type == IS_CV) {
 								res_use_info = RES_USE_INFO();
 							} else {
+#if USE_ABSTRACT_STACK_FOR_RES_USE_INFO
 								res_use_info = zend_jit_trace_type_to_info(STACK_VAR_TYPE(opline->result.var));
+#else
+								res_use_info = -1;
+#endif
 							}
 							res_addr = RES_REG_ADDR();
 						}
@@ -3270,7 +3278,11 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 							if (opline->result_type == IS_CV) {
 								res_use_info = RES_USE_INFO();
 							} else {
+#if USE_ABSTRACT_STACK_FOR_RES_USE_INFO
 								res_use_info = zend_jit_trace_type_to_info(STACK_VAR_TYPE(opline->result.var));
+#else
+								res_use_info = -1;
+#endif
 							}
 							res_addr = RES_REG_ADDR();
 						}