From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 18 May 2020 11:30:55 +0000 (+0300)
Subject: func_info should be empty
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a463197d7a3d29cc7935422a36762bd876c01dd9;p=php

func_info should be empty
---

diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
index 35e0ceeed2..7921c1186d 100644
--- a/ext/opcache/jit/zend_jit.c
+++ b/ext/opcache/jit/zend_jit.c
@@ -3207,7 +3207,6 @@ void ZEND_FASTCALL zend_jit_hot_func(zend_execute_data *execute_data, const zend
 static int zend_jit_setup_hot_counters(zend_op_array *op_array)
 {
 	zend_op *opline = op_array->opcodes;
-	zend_func_info *func_info;
 	zend_jit_op_array_hot_extension *jit_extension;
 	zend_cfg cfg;
 	uint32_t i;
@@ -3220,14 +3219,9 @@ static int zend_jit_setup_hot_counters(zend_op_array *op_array)
 	}
 
 	jit_extension = (zend_jit_op_array_hot_extension*)zend_shared_alloc(sizeof(zend_jit_op_array_hot_extension) + (op_array->last - 1) * sizeof(void*));
-	func_info = (zend_func_info*)ZEND_FUNC_INFO(op_array);
-	if (func_info) {
-		memcpy(&jit_extension->func_info, func_info, sizeof(zend_func_info));
-	} else {
-		memset(&jit_extension->func_info, 0, sizeof(zend_func_info));
-		jit_extension->func_info.num_args = -1;
-		jit_extension->func_info.return_value_used = -1;
-	}
+	memset(&jit_extension->func_info, 0, sizeof(zend_func_info));
+	jit_extension->func_info.num_args = -1;
+	jit_extension->func_info.return_value_used = -1;
 	jit_extension->counter = &zend_jit_hot_counters[zend_jit_op_array_hash(op_array) & (ZEND_HOT_COUNTERS_COUNT - 1)];
 	for (i = 0; i < op_array->last; i++) {
 		jit_extension->orig_handlers[i] = op_array->opcodes[i].handler;
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
index 6a18fed009..8324f50ca3 100644
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -5059,7 +5059,6 @@ static zend_always_inline uint8_t zend_jit_trace_supported(const zend_op *opline
 static int zend_jit_setup_hot_trace_counters(zend_op_array *op_array)
 {
 	zend_op *opline;
-	zend_func_info *func_info;
 	zend_jit_op_array_trace_extension *jit_extension;
 	zend_cfg cfg;
 	uint32_t i;
@@ -5074,14 +5073,9 @@ static int zend_jit_setup_hot_trace_counters(zend_op_array *op_array)
 	}
 
 	jit_extension = (zend_jit_op_array_trace_extension*)zend_shared_alloc(sizeof(zend_jit_op_array_trace_extension) + (op_array->last - 1) * sizeof(zend_op_trace_info));
-	func_info = (zend_func_info*)ZEND_FUNC_INFO(op_array);
-	if (func_info) {
-		memcpy(&jit_extension->func_info, func_info, sizeof(zend_func_info));
-	} else {
-		memset(&jit_extension->func_info, 0, sizeof(zend_func_info));
-		jit_extension->func_info.num_args = -1;
-		jit_extension->func_info.return_value_used = -1;
-	}
+	memset(&jit_extension->func_info, 0, sizeof(zend_func_info));
+	jit_extension->func_info.num_args = -1;
+	jit_extension->func_info.return_value_used = -1;
 	jit_extension->offset = (char*)jit_extension->trace_info - (char*)op_array->opcodes;
 	for (i = 0; i < op_array->last; i++) {
 		jit_extension->trace_info[i].orig_handler = op_array->opcodes[i].handler;