Skip to content

Commit 76724fc

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fixed regression intoduced by 76c41d2
2 parents dd8a945 + fbf4e19 commit 76724fc

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
@@ -14886,6 +14886,7 @@ static bool zend_jit_fetch_indirect_var(dasm_State **Dst, const zend_op *opline,
1488614886
(opline-1)->result_type != IS_VAR ||
1488714887
(opline-1)->result.var != opline->op1.var ||
1488814888
(opline-1)->op1_type == IS_VAR ||
14889+
(opline-1)->op2_type == IS_VAR ||
1488914890
(opline-1)->op2_type == IS_TMP_VAR) {
1489014891
| GET_ZVAL_PTR FCARG1x, var_addr, TMP1
1489114892
} 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
@@ -15856,6 +15856,7 @@ static bool zend_jit_fetch_indirect_var(dasm_State **Dst, const zend_op *opline,
1585615856
(opline-1)->result_type != IS_VAR ||
1585715857
(opline-1)->result.var != opline->op1.var ||
1585815858
(opline-1)->op1_type == IS_VAR ||
15859+
(opline-1)->op2_type == IS_VAR ||
1585915860
(opline-1)->op2_type == IS_TMP_VAR) {
1586015861
| GET_ZVAL_PTR FCARG1a, var_addr
1586115862
} else if ((opline-1)->opcode == ZEND_FETCH_DIM_W || (opline-1)->opcode == ZEND_FETCH_DIM_RW) {

0 commit comments

Comments
 (0)