Fix merge error (php#18453)

arnaud-lb · web-flow · commit 2fea4efa8f28 · 2025-04-29T17:06:59.000+02:00
diff --git 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;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -8731,9 +8731,7 @@ int ZEND_FASTCALL zend_jit_trace_exit(uint32_t exit_num, zend_jit_registers_buf`
`8731`	`8731`	`if (EG(exception)) {`
`8732`	`8732`	`/* EX(opline) was overridden in zend_jit_trace_exit_stub(),`
`8733`	`8733`	`* and may be wrong when IP is reused. */`
`8734`		`- if (GCC_GLOBAL_REGS) {`
`8735`		`- EX(opline) = EG(exception_op);`
`8736`		`- }`
	`8734`	`+ EX(opline) = EG(exception_op);`
`8737`	`8735`	`return 0;`
`8738`	`8736`	`}`
`8739`	`8737`	`}`