From fbf4e196dadcbe3047608be258d9cf45e3d773f6 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 25 Oct 2023 15:15:13 +0300 Subject: [PATCH] Fixed regression intoduced by 76c41d27f9277eb8210d0058f19d0a7cfa7d7a66 --- ext/opcache/jit/zend_jit_arm64.dasc | 1 + ext/opcache/jit/zend_jit_x86.dasc | 1 + 2 files changed, 2 insertions(+) diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc index 013600baf8d..1583706855d 100644 --- a/ext/opcache/jit/zend_jit_arm64.dasc +++ b/ext/opcache/jit/zend_jit_arm64.dasc @@ -14933,6 +14933,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) { diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 31b8bfa2dea..b3989a4ae25 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -15886,6 +15886,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) {