Skip to content

Commit 7d67b19

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Fixed regression intoduced by 76c41d2
2 parents a64b48b + 76724fc commit 7d67b19

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

ext/opcache/jit/zend_jit_arm64.dasc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14931,6 +14931,7 @@ static bool zend_jit_fetch_indirect_var(dasm_State **Dst, const zend_op *opline,
1493114931
(opline-1)->result_type != IS_VAR ||
1493214932
(opline-1)->result.var != opline->op1.var ||
1493314933
(opline-1)->op1_type == IS_VAR ||
14934+
(opline-1)->op2_type == IS_VAR ||
1493414935
(opline-1)->op2_type == IS_TMP_VAR) {
1493514936
| GET_ZVAL_PTR FCARG1x, var_addr, TMP1
1493614937
} else if ((opline-1)->opcode == ZEND_FETCH_DIM_W || (opline-1)->opcode == ZEND_FETCH_DIM_RW) {

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15905,6 +15905,7 @@ static bool zend_jit_fetch_indirect_var(dasm_State **Dst, const zend_op *opline,
1590515905
(opline-1)->result_type != IS_VAR ||
1590615906
(opline-1)->result.var != opline->op1.var ||
1590715907
(opline-1)->op1_type == IS_VAR ||
15908+
(opline-1)->op2_type == IS_VAR ||
1590815909
(opline-1)->op2_type == IS_TMP_VAR) {
1590915910
| GET_ZVAL_PTR FCARG1a, var_addr
1591015911
} else if ((opline-1)->opcode == ZEND_FETCH_DIM_W || (opline-1)->opcode == ZEND_FETCH_DIM_RW) {

0 commit comments

Comments
 (0)