@@ -27,11 +27,6 @@ static ZEND_COLD void undef_result_after_exception(void) {
27
27
}
28
28
}
29
29
30
- ZEND_API ZEND_COLD void zend_jit_illegal_container_offset (const char * container , const zval * offset )
31
- {
32
- zend_type_error ("Cannot access offset of type %s on %s" , zend_get_type_by_const (Z_TYPE_P (offset )), container );
33
- }
34
-
35
30
static ZEND_COLD void zend_jit_illegal_empty_or_isset_offset (const zval * offset )
36
31
{
37
32
zend_type_error ("Cannot access offset of type %s in isset or empty" , zend_get_type_by_const (Z_TYPE_P (offset )));
@@ -488,7 +483,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_r_helper(zend_array *ht, zval *dim,
488
483
hval = 1 ;
489
484
goto num_index ;
490
485
default :
491
- zend_jit_illegal_container_offset ("array" , dim );
486
+ zend_illegal_container_offset ("array" , dim );
492
487
undef_result_after_exception ();
493
488
return ;
494
489
}
@@ -630,7 +625,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_is_helper(zend_array *ht, zval *dim
630
625
hval = 1 ;
631
626
goto num_index ;
632
627
default :
633
- zend_jit_illegal_container_offset ("array" , dim );
628
+ zend_illegal_container_offset ("array" , dim );
634
629
undef_result_after_exception ();
635
630
return ;
636
631
}
@@ -868,7 +863,7 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_rw_helper(zend_array *ht, zval *di
868
863
hval = 1 ;
869
864
goto num_index ;
870
865
default :
871
- zend_jit_illegal_container_offset ("array" , dim );
866
+ zend_illegal_container_offset ("array" , dim );
872
867
undef_result_after_exception ();
873
868
return NULL ;
874
869
}
@@ -1001,7 +996,7 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_w_helper(zend_array *ht, zval *dim
1001
996
hval = 1 ;
1002
997
goto num_index ;
1003
998
default :
1004
- zend_jit_illegal_container_offset ("array" , dim );
999
+ zend_illegal_container_offset ("array" , dim );
1005
1000
undef_result_after_exception ();
1006
1001
if (EG (opline_before_exception )
1007
1002
&& (EG (opline_before_exception )+ 1 )-> opcode == ZEND_OP_DATA
@@ -1044,7 +1039,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim/*, int typ
1044
1039
}
1045
1040
return offset ;
1046
1041
}
1047
- zend_jit_illegal_container_offset ("string" , dim );
1042
+ zend_illegal_container_offset ("string" , dim );
1048
1043
return 0 ;
1049
1044
}
1050
1045
case IS_UNDEF :
@@ -1060,7 +1055,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim/*, int typ
1060
1055
dim = Z_REFVAL_P (dim );
1061
1056
goto try_again ;
1062
1057
default :
1063
- zend_jit_illegal_container_offset ("string" , dim );
1058
+ zend_illegal_container_offset ("string" , dim );
1064
1059
return 0 ;
1065
1060
}
1066
1061
@@ -1135,7 +1130,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_str_is_helper(zend_string *str, zva
1135
1130
dim = Z_REFVAL_P (dim );
1136
1131
goto try_string_offset ;
1137
1132
default :
1138
- zend_jit_illegal_container_offset ("string" , dim );
1133
+ zend_illegal_container_offset ("string" , dim );
1139
1134
break ;
1140
1135
}
1141
1136
0 commit comments