mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
Fixed regression intoduced by 76c41d27f9
This commit is contained in:
@@ -14931,6 +14931,7 @@ static bool zend_jit_fetch_indirect_var(dasm_State **Dst, const zend_op *opline,
|
||||
(opline-1)->result_type != IS_VAR ||
|
||||
(opline-1)->result.var != opline->op1.var ||
|
||||
(opline-1)->op1_type == IS_VAR ||
|
||||
(opline-1)->op2_type == IS_VAR ||
|
||||
(opline-1)->op2_type == IS_TMP_VAR) {
|
||||
| GET_ZVAL_PTR FCARG1x, var_addr, TMP1
|
||||
} else if ((opline-1)->opcode == ZEND_FETCH_DIM_W || (opline-1)->opcode == ZEND_FETCH_DIM_RW) {
|
||||
|
||||
@@ -15905,6 +15905,7 @@ static bool zend_jit_fetch_indirect_var(dasm_State **Dst, const zend_op *opline,
|
||||
(opline-1)->result_type != IS_VAR ||
|
||||
(opline-1)->result.var != opline->op1.var ||
|
||||
(opline-1)->op1_type == IS_VAR ||
|
||||
(opline-1)->op2_type == IS_VAR ||
|
||||
(opline-1)->op2_type == IS_TMP_VAR) {
|
||||
| GET_ZVAL_PTR FCARG1a, var_addr
|
||||
} else if ((opline-1)->opcode == ZEND_FETCH_DIM_W || (opline-1)->opcode == ZEND_FETCH_DIM_RW) {
|
||||
|
||||
Reference in New Issue
Block a user