From d258bb81797ca76247ebaa4cc54f146ec16d33b8 Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Tue, 29 Apr 2025 12:35:27 +0200 Subject: [PATCH] Fix merge error --- ext/opcache/jit/zend_jit_trace.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index faa88cc6b2e56..a2c3c7fa0fbb4 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/ext/opcache/jit/zend_jit_trace.c @@ -8731,9 +8731,7 @@ int ZEND_FASTCALL zend_jit_trace_exit(uint32_t exit_num, zend_jit_registers_buf if (EG(exception)) { /* EX(opline) was overridden in zend_jit_trace_exit_stub(), * and may be wrong when IP is reused. */ - if (GCC_GLOBAL_REGS) { - EX(opline) = EG(exception_op); - } + EX(opline) = EG(exception_op); return 0; } }