php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-02 21:52:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

JIT/ARM64: Fixed possible incorrect exception catching in function JIT.

Browse Source
This commit is contained in:
Dmitry Stogov
2021-06-30 18:18:30 +03:00
parent ef0d916d8f
commit ff983131e7
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ext/opcache/jit/zend_jit_arm64.dasc
View File

@@ -1803,7 +1803,7 @@ static int zend_jit_exception_handler_stub(dasm_State **Dst)
if (GCC_GLOBAL_REGS) {
| ldp x29, x30, [sp], # SPAD // stack alignment
| EXT_JMP handler, REG0
} else if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {
} else {
| mov FCARG1x, FP
| EXT_CALL handler, REG0
| ldp FP, RX, T2 // retore FP and IP
@@ -1812,11 +1812,6 @@ static int zend_jit_exception_handler_stub(dasm_State **Dst)
| mov RETVALw, #1 // ZEND_VM_ENTER
|1:
| ret
} else {
| mov FCARG1x, FP
| ldp FP, RX, T2 // retore FP and IP
| ldp x29, x30, [sp], # NR_SPAD // stack alignment
| EXT_JMP handler, REG0
}
}