Remove old code (BP_VAR_RW warning)

diff --git a/ext/opcache/jit/zend_jit_disasm_x86.c b/ext/opcache/jit/zend_jit_disasm_x86.c
index 47292f675dff8972395cf457ce6ba78dc35e3caa..2e73648257ee3ef96438d860823b9d23f4042522 100644 (file)
--- a/ext/opcache/jit/zend_jit_disasm_x86.c
+++ b/ext/opcache/jit/zend_jit_disasm_x86.c
@@ -409,7 +409,6 @@ static int zend_jit_disasm_init(void)
        REGISTER_HELPER(zend_jit_hash_lookup_w);
        REGISTER_HELPER(zend_jit_symtable_lookup_rw);
        REGISTER_HELPER(zend_jit_symtable_lookup_w);
-       REGISTER_HELPER(zend_jit_fetch_dimension_rw_long_helper);
        REGISTER_HELPER(zend_jit_undefined_op_helper);
        REGISTER_HELPER(zend_jit_fetch_dim_r_helper);
        REGISTER_HELPER(zend_jit_fetch_dim_is_helper);

diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c
index c282dea4e236deb9d3399073c566a8e117ab543b..e42fd196aa93f1c96e16510772b4986f4db28f78 100644 (file)
--- a/ext/opcache/jit/zend_jit_helpers.c
+++ b/ext/opcache/jit/zend_jit_helpers.c
@@ -810,12 +810,6 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_obj_is_helper(zval *container, zval
        }
 }
 
-static zval* ZEND_FASTCALL zend_jit_fetch_dimension_rw_long_helper(HashTable *ht, zend_long hval)
-{
-       zend_error(E_NOTICE,"Undefined array key " ZEND_LONG_FMT, hval);
-       return zend_hash_index_update(ht, hval, &EG(uninitialized_zval));
-}
-
 static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type)
 {
        zend_long offset;

diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
index 6a2fa0a7c8f4635ef80e7364fc02c37a86cf4e0f..f2a5c99321c68f7424c482ef4827bb47ee7ce38a 100644 (file)
--- a/ext/opcache/jit/zend_jit_x86.dasc
+++ b/ext/opcache/jit/zend_jit_x86.dasc
@@ -4823,7 +4823,7 @@ static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_o
        zend_jit_addr res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->result.var);
 
        if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE
-        && (type == BP_VAR_R || type == BP_VAR_RW)
+        && type == BP_VAR_R
         && !exit_addr) {
                int32_t exit_point = zend_jit_trace_get_exit_point(opline, opline, NULL, ZEND_JIT_EXIT_TO_VM);
                exit_addr = zend_jit_trace_get_exit_addr(exit_point);
@@ -4865,7 +4865,7 @@ static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_o
                                                } else {
                                                        |       jbe >9 // NOT_FOUND
                                                }
-                                       } else if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE && (type == BP_VAR_R || type == BP_VAR_RW)) {
+                                       } else if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE && type == BP_VAR_R) {
                                                |       jbe &exit_addr
                                        } else if (type == BP_VAR_IS && not_found_exit_addr) {
                                                |       jbe &not_found_exit_addr
@@ -4904,7 +4904,7 @@ static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_o
                                        } else {
                                                |       jbe >9 // NOT_FOUND
                                        }
-                               } else if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE && (type == BP_VAR_R || type == BP_VAR_RW)) {
+                               } else if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE && type == BP_VAR_R) {
                                        |       jbe &exit_addr
                                } else if (type == BP_VAR_IS && not_found_exit_addr) {
                                        |       jbe &not_found_exit_addr
@@ -5009,16 +5009,7 @@ static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_o
                                break;
                        case BP_VAR_RW:
                                |2:
-                               if (JIT_G(trigger) != ZEND_JIT_ON_HOT_TRACE) {
-                                       |       SAVE_VALID_OPLINE opline, r0
-                                       |       // zend_error(E_NOTICE,"Undefined arary offset " ZEND_LONG_FMT, hval);
-                                       |       //retval = zend_hash_index_update(ht, hval, &EG(uninitialized_zval));
-                                       |       EXT_CALL zend_jit_fetch_dimension_rw_long_helper, r0
-                               }
                                if (op1_info & MAY_BE_ARRAY_KEY_LONG) {
-                                       if (JIT_G(trigger) != ZEND_JIT_ON_HOT_TRACE) {
-                                               |       jmp >8
-                                       }
                                        |4:
                                        |       SAVE_VALID_OPLINE opline, r0
                                        |       EXT_CALL zend_jit_hash_index_lookup_rw, r0