From 2fea4efa8f2821bf3cf767a73c1bef2c7b0a1791 Mon Sep 17 00:00:00 2001
From: Arnaud Le Blanc <365207+arnaud-lb@users.noreply.github.com>
Date: Tue, 29 Apr 2025 17:06:59 +0200
Subject: [PATCH] Fix merge error (#18453)

---
 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 faa88cc6b2e..a2c3c7fa0fb 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;
 			}
 		}