Fixed #79582 (Crash seen when opcache.jit=1235 and opcache.jit_debug=2)

diff --git a/NEWS b/NEWS
index 0a5b9bfee2e04b6d7c5fcff6ec47a93997a092d6..7d42d73cfc0d62083c6a29cb78fc1e43259120fe 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -67,6 +67,8 @@ PHP                                                                        NEWS
   . Removed deprecated INTL_IDNA_VARIANT_2003. (cmb)
 
 - JIT:
+  . Fixed bug #79582 (Crash seen when opcache.jit=1235 and
+    opcache.jit_debug=2). (Laruence)
   . Fixed bug #77857 (Wrong result if executed with JIT). (Laruence)
   . Fixed bug #79255 (PHP cannot be compiled with enable JIT).
     (Laruence, Dmitry)

diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
index 5f7d12c1166f984936543ba58f26f2a8f8af8dc5..09c997b5b1c8d971ce4061d7df68ed2cfbb0521e 100644 (file)
--- a/ext/opcache/jit/zend_jit.c
+++ b/ext/opcache/jit/zend_jit.c
@@ -3206,6 +3206,7 @@ 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;
@@ -3218,6 +3219,14 @@ 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;
+       }
        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_internal.h b/ext/opcache/jit/zend_jit_internal.h
index 531727a642f730ce3a8bb37734645422b6472c0c..da68b0ba90ffc70660051fc306e748bfff1ad7e7 100644 (file)
--- a/ext/opcache/jit/zend_jit_internal.h
+++ b/ext/opcache/jit/zend_jit_internal.h
@@ -53,6 +53,7 @@ static zend_always_inline zend_long zend_jit_hash(const void *ptr)
 void ZEND_FASTCALL zend_jit_hot_func(zend_execute_data *execute_data, const zend_op *opline);
 
 typedef struct _zend_jit_op_array_hot_extension {
+       zend_func_info func_info;
        int16_t    *counter;
        const void *orig_handlers[1];
 } zend_jit_op_array_hot_extension;

diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
index 4dfde5454be2c8e31f077702763a6c3d94888a26..e6fc46d067fbf0bb966daec53c322dcd23ed54cd 100644 (file)
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -4984,6 +4984,7 @@ 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;
@@ -4998,9 +4999,14 @@ 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));
-       memset(&jit_extension->func_info, 0, sizeof(jit_extension->func_info));
-       jit_extension->func_info.num_args = -1;
-       jit_extension->func_info.return_value_used = -1;
+       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;
+       }
        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;