Skip to content

Commit 99c0efc

Browse files
committed
JIT/x86: Fixed possible incorrect exception catching in function JIT.
1 parent 9b7b4c4 commit 99c0efc

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1796,7 +1796,7 @@ static int zend_jit_exception_handler_stub(dasm_State **Dst)
17961796
if (GCC_GLOBAL_REGS) {
17971797
| add r4, SPAD // stack alignment
17981798
| EXT_JMP handler, r0
1799-
} else if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {
1799+
} else {
18001800
| mov FCARG1a, FP
18011801
| EXT_CALL handler, r0
18021802
| mov FP, aword T2 // restore FP
@@ -1807,12 +1807,6 @@ static int zend_jit_exception_handler_stub(dasm_State **Dst)
18071807
| mov r0, 1 // ZEND_VM_ENTER
18081808
|1:
18091809
| ret
1810-
} else {
1811-
| mov FCARG1a, FP
1812-
| mov FP, aword T2 // restore FP
1813-
| mov RX, aword T3 // restore IP
1814-
| add r4, NR_SPAD // stack alignment
1815-
| EXT_JMP handler, r0
18161810
}
18171811
}
18181812

0 commit comments

Comments
 (0)