Skip to content

Commit e35c163

Browse files
committed
Tracing JIT SHM data initilaizarion must be done at MINIT
1 parent d1a92dd commit e35c163

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ext/opcache/jit/zend_jit.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3795,6 +3795,10 @@ ZEND_EXT_API int zend_jit_startup(void *buf, size_t size, zend_bool reattached)
37953795
#endif
37963796
}
37973797

3798+
if (zend_jit_trace_startup() != SUCCESS) {
3799+
return FAILURE;
3800+
}
3801+
37983802
return SUCCESS;
37993803
}
38003804

ext/opcache/jit/zend_jit_trace.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5089,10 +5089,6 @@ static int zend_jit_setup_hot_trace_counters(zend_op_array *op_array)
50895089
zend_cfg cfg;
50905090
uint32_t i;
50915091

5092-
if (!zend_jit_traces && zend_jit_trace_startup() != SUCCESS) {
5093-
return FAILURE;
5094-
}
5095-
50965092
ZEND_ASSERT(zend_jit_func_trace_counter_handler != NULL);
50975093
ZEND_ASSERT(zend_jit_ret_trace_counter_handler != NULL);
50985094
ZEND_ASSERT(zend_jit_loop_trace_counter_handler != NULL);

0 commit comments

Comments
 (0)