Skip to content

Commit f21a248

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: Apply fix to ARM JIT as well
2 parents f811893 + f2bb739 commit f21a248

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ext/opcache/jit/zend_jit_arm64.dasc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5934,6 +5934,9 @@ static int zend_jit_assign_dim_op(dasm_State **Dst, const zend_op *opline, uint3
59345934
| CMP_ZVAL_TYPE op1_addr, IS_NULL, ZREG_TMP1
59355935
| bgt >7
59365936
}
5937+
if (Z_REG(op1_addr) != ZREG_FP) {
5938+
| str Rx(Z_REG(op1_addr)), T1 // save
5939+
}
59375940
if (op1_info & MAY_BE_UNDEF) {
59385941
if (op1_info & MAY_BE_NULL) {
59395942
| IF_NOT_ZVAL_TYPE op1_addr, IS_UNDEF, >1, ZREG_TMP1
@@ -5944,9 +5947,6 @@ static int zend_jit_assign_dim_op(dasm_State **Dst, const zend_op *opline, uint3
59445947
|1:
59455948
}
59465949
| // ZVAL_ARR(container, zend_new_array(8));
5947-
if (Z_REG(op1_addr) != ZREG_FP) {
5948-
| str Rx(Z_REG(op1_addr)), T1 // save
5949-
}
59505950
| EXT_CALL _zend_new_array_0, REG0
59515951
| mov REG0, RETVALx
59525952
if (Z_REG(op1_addr) != ZREG_FP) {

0 commit comments

Comments
 (0)