Merge branch 'PHP-8.3'

dstogov · dstogov · commit 16d4fb19a950 · 2024-08-27T21:12:53.000+03:00
* PHP-8.3: Fix GH-15502: Crash with JIT and Excimer (#15601)
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -7159,7 +7159,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 					for (i = 0; i < op_array->last_var + op_array->T; i++) {
 						SET_STACK_TYPE(stack, i, IS_UNKNOWN, 1);
 					}
-					exit_point = zend_jit_trace_get_exit_point(opline, ZEND_JIT_EXIT_TO_VM);
+					exit_point = zend_jit_trace_get_exit_point(zend_jit_traces[t->link].opline, ZEND_JIT_EXIT_TO_VM);
 					timeout_exit_addr = zend_jit_trace_get_exit_addr(exit_point);
 					if (!timeout_exit_addr) {
 						goto jit_failure;

Original file line number	Diff line number	Diff line change
`@@ -7159,7 +7159,7 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`7159`	`7159`	`for (i = 0; i < op_array->last_var + op_array->T; i++) {`
`7160`	`7160`	`SET_STACK_TYPE(stack, i, IS_UNKNOWN, 1);`
`7161`	`7161`	`}`
`7162`		`- exit_point = zend_jit_trace_get_exit_point(opline, ZEND_JIT_EXIT_TO_VM);`
	`7162`	`+ exit_point = zend_jit_trace_get_exit_point(zend_jit_traces[t->link].opline, ZEND_JIT_EXIT_TO_VM);`
`7163`	`7163`	`timeout_exit_addr = zend_jit_trace_get_exit_addr(exit_point);`
`7164`	`7164`	`if (!timeout_exit_addr) {`
`7165`	`7165`	`goto jit_failure;`