Skip to content

Commit 724e64f

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fixed deoptimization info for interrupt handler
2 parents 5b79c53 + 8f06feb commit 724e64f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

ext/opcache/jit/zend_jit_trace.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6823,7 +6823,8 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
68236823
if (!(t->flags & ZEND_JIT_TRACE_USES_INITIAL_IP)
68246824
|| (ra
68256825
&& zend_jit_trace_stack_needs_deoptimization(stack, op_array->last_var + op_array->T))) {
6826-
uint32_t exit_point = zend_jit_trace_get_exit_point(opline, ZEND_JIT_EXIT_TO_VM);
6826+
/* Deoptimize to the first instruction of the loop */
6827+
uint32_t exit_point = zend_jit_trace_get_exit_point(trace_buffer[1].opline, ZEND_JIT_EXIT_TO_VM);
68276828

68286829
timeout_exit_addr = zend_jit_trace_get_exit_addr(exit_point);
68296830
if (!timeout_exit_addr) {

0 commit comments

Comments
 (0)