php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge error (#18453)

Browse Source
This commit is contained in:
Arnaud Le Blanc
2025-04-29 17:06:59 +02:00
committed by GitHub
parent 0eea5d31e0
commit 2fea4efa8f
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/opcache/jit/zend_jit_trace.c
View File

@@ -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;
}
}