Skip to content

Commit 57a01e3

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Keep original EG(jit_trace_num) value around __autoload()
2 parents 28a40b2 + f7d0a3e commit 57a01e3

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

ext/spl/php_spl.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,11 @@ static int spl_autoload(zend_string *class_name, zend_string *lc_name, const cha
268268
}
269269
zend_string_release_ex(opened_path, 0);
270270
if (new_op_array) {
271+
uint32_t orig_jit_trace_num = EG(jit_trace_num);
272+
271273
ZVAL_UNDEF(&result);
272274
zend_execute(new_op_array, &result);
275+
EG(jit_trace_num) = orig_jit_trace_num;
273276

274277
destroy_op_array(new_op_array);
275278
efree(new_op_array);

0 commit comments

Comments
 (0)