Skip to content

Commit d0c336a

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Use the immutable twin of temporary op_array (php#16861)
2 parents 315fef2 + d1a9281 commit d0c336a

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
@@ -7437,6 +7437,11 @@ static zend_jit_trace_stop zend_jit_compile_root_trace(zend_jit_trace_rec *trace
74377437
t->polymorphism = 0;
74387438
t->jmp_table_size = 0;
74397439
t->op_array = trace_buffer[0].op_array;
7440+
if (!(t->op_array->fn_flags & ZEND_ACC_IMMUTABLE)) {
7441+
zend_jit_op_array_trace_extension *jit_extension =
7442+
(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(t->op_array);
7443+
t->op_array = jit_extension->op_array;
7444+
}
74407445
t->opline = trace_buffer[1].opline;
74417446
t->exit_info = exit_info;
74427447
t->stack_map = NULL;

0 commit comments

Comments
 (0)