Skip to content

Commit ff98313

Browse files
committed
JIT/ARM64: Fixed possible incorrect exception catching in function JIT.
1 parent ef0d916 commit ff98313

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

ext/opcache/jit/zend_jit_arm64.dasc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,7 +1803,7 @@ static int zend_jit_exception_handler_stub(dasm_State **Dst)
18031803
if (GCC_GLOBAL_REGS) {
18041804
| ldp x29, x30, [sp], # SPAD // stack alignment
18051805
| EXT_JMP handler, REG0
1806-
} else if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {
1806+
} else {
18071807
| mov FCARG1x, FP
18081808
| EXT_CALL handler, REG0
18091809
| ldp FP, RX, T2 // retore FP and IP
@@ -1812,11 +1812,6 @@ static int zend_jit_exception_handler_stub(dasm_State **Dst)
18121812
| mov RETVALw, #1 // ZEND_VM_ENTER
18131813
|1:
18141814
| ret
1815-
} else {
1816-
| mov FCARG1x, FP
1817-
| ldp FP, RX, T2 // retore FP and IP
1818-
| ldp x29, x30, [sp], # NR_SPAD // stack alignment
1819-
| EXT_JMP handler, REG0
18201815
}
18211816
}
18221817

0 commit comments

Comments
 (0)