Skip to content

Commit ba0ecaa

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Use the immutable twin of temporary op_array (php#16861)
2 parents 86e2a48 + d0c336a commit ba0ecaa

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

ext/opcache/jit/zend_jit_trace.c

+5
Original file line numberDiff line numberDiff line change
@@ -7506,6 +7506,11 @@ static zend_jit_trace_stop zend_jit_compile_root_trace(zend_jit_trace_rec *trace
75067506
t->polymorphism = 0;
75077507
t->jmp_table_size = 0;
75087508
t->op_array = trace_buffer[0].op_array;
7509+
if (!(t->op_array->fn_flags & ZEND_ACC_IMMUTABLE)) {
7510+
zend_jit_op_array_trace_extension *jit_extension =
7511+
(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(t->op_array);
7512+
t->op_array = jit_extension->op_array;
7513+
}
75097514
t->opline = trace_buffer[1].opline;
75107515
t->exit_info = exit_info;
75117516
t->stack_map = NULL;

0 commit comments

Comments
 (0)