Merge branch 'PHP-8.5'

dstogov · dstogov · commit 061f90a4bad5 · 2026-05-12T14:28:51.000+03:00
* PHP-8.5: Fix COMMUNITY_asan failure on src/Symfony/Component/HttpClient (php#22021)
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -8568,7 +8568,7 @@ int ZEND_FASTCALL zend_jit_trace_hot_side(zend_execute_data *execute_data, uint3
 			do {
 				ex = ex->prev_execute_data;
 				n++;
-			} while (ex && zend_jit_traces[root].op_array != &ex->func->op_array);
+			} while (ex && (!ex->func || zend_jit_traces[root].op_array != &ex->func->op_array));
 			if (ex && n <= ZEND_JIT_TRACE_MAX_RET_DEPTH) {
 				ret_depth = n;
 			}

Original file line number	Diff line number	Diff line change
`@@ -8568,7 +8568,7 @@ int ZEND_FASTCALL zend_jit_trace_hot_side(zend_execute_data *execute_data, uint3`
`8568`	`8568`	`do {`
`8569`	`8569`	`ex = ex->prev_execute_data;`
`8570`	`8570`	`n++;`
`8571`		`- } while (ex && zend_jit_traces[root].op_array != &ex->func->op_array);`
	`8571`	`+ } while (ex && (!ex->func \|\| zend_jit_traces[root].op_array != &ex->func->op_array));`
`8572`	`8572`	`if (ex && n <= ZEND_JIT_TRACE_MAX_RET_DEPTH) {`
`8573`	`8573`	`ret_depth = n;`
`8574`	`8574`	`}`