Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Use the immutable twin of temporary op_array (#16861)
This commit is contained in:
Dmitry Stogov 2024-11-19 20:55:40 +03:00
commit d0c336a666
No known key found for this signature in database

View File

@ -7437,6 +7437,11 @@ static zend_jit_trace_stop zend_jit_compile_root_trace(zend_jit_trace_rec *trace
t->polymorphism = 0;
t->jmp_table_size = 0;
t->op_array = trace_buffer[0].op_array;
if (!(t->op_array->fn_flags & ZEND_ACC_IMMUTABLE)) {
zend_jit_op_array_trace_extension *jit_extension =
(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(t->op_array);
t->op_array = jit_extension->op_array;
}
t->opline = trace_buffer[1].opline;
t->exit_info = exit_info;
t->stack_map = NULL;