Merge branch 'PHP-8.4' into PHP-8.5

dstogov · dstogov · commit 9e3e41f77802 · 2026-05-12T14:28:41.000+03:00
* PHP-8.4: Fix COMMUNITY_asan failure on src/Symfony/Component/HttpClient (#22021)
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -8551,7 +8551,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
`@@ -8551,7 +8551,7 @@ int ZEND_FASTCALL zend_jit_trace_hot_side(zend_execute_data *execute_data, uint3`
`8551`	`8551`	`do {`
`8552`	`8552`	`ex = ex->prev_execute_data;`
`8553`	`8553`	`n++;`
`8554`		`- } while (ex && zend_jit_traces[root].op_array != &ex->func->op_array);`
	`8554`	`+ } while (ex && (!ex->func \|\| zend_jit_traces[root].op_array != &ex->func->op_array));`
`8555`	`8555`	`if (ex && n <= ZEND_JIT_TRACE_MAX_RET_DEPTH) {`
`8556`	`8556`	`ret_depth = n;`
`8557`	`8557`	`}`