Skip to content

Commit d1a9281

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Use the immutable twin of temporary op_array (php#16861)
2 parents 65bd3db + ef5844a commit d1a9281

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
@@ -7181,6 +7181,11 @@ static zend_jit_trace_stop zend_jit_compile_root_trace(zend_jit_trace_rec *trace
71817181
t->polymorphism = 0;
71827182
t->jmp_table_size = 0;
71837183
t->op_array = trace_buffer[0].op_array;
7184+
if (!(t->op_array->fn_flags & ZEND_ACC_IMMUTABLE)) {
7185+
zend_jit_op_array_trace_extension *jit_extension =
7186+
(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(t->op_array);
7187+
t->op_array = jit_extension->op_array;
7188+
}
71847189
t->opline = trace_buffer[1].opline;
71857190
t->exit_info = exit_info;
71867191
t->stack_map = NULL;

0 commit comments

Comments
 (0)