@@ -2210,27 +2210,27 @@ ZEND_ATTRIBUTE_NONNULL static void bind_generic_types_for_inherited_interfaces(z
22102210 zend_string * iface_lc_name = zend_string_tolower (iface -> name );
22112211 const HashTable * ce_bound_types = ce -> bound_types ? zend_hash_find_ptr (ce -> bound_types , iface_lc_name ) : NULL ;
22122212 for (uint32_t i = 0 ; i < iface -> num_interfaces ; i ++ ) {
2213- zend_class_entry * entry = iface -> interfaces [i ];
2213+ const zend_class_entry * inherited_iface = iface -> interfaces [i ];
22142214 /* Bind generic types */
22152215 /* We need to propagate the bound generic parameters to the inherited interfaces */
2216- if (entry -> num_generic_parameters == 0 ) {
2216+ if (inherited_iface -> num_generic_parameters == 0 ) {
22172217 continue ;
22182218 }
2219- zend_string * inherited_iface_lc_name = zend_string_tolower (entry -> name );
2219+ zend_string * inherited_iface_lc_name = zend_string_tolower (inherited_iface -> name );
22202220 const HashTable * interface_bound_types = zend_hash_find_ptr (iface -> bound_types , inherited_iface_lc_name );
22212221 HashTable * ce_bound_types_to_inherited_iface = zend_hash_find_ptr (ce -> bound_types , inherited_iface_lc_name );
22222222 ZEND_ASSERT (interface_bound_types != NULL && "This must exist at this point" );
22232223 if (ce_bound_types_to_inherited_iface == NULL ) {
22242224 ALLOC_HASHTABLE (ce_bound_types_to_inherited_iface );
2225- zend_hash_init (ce_bound_types_to_inherited_iface , entry -> num_generic_parameters , NULL , zend_types_ht_dtor , false /* todo depend on internal or not */ );
2225+ zend_hash_init (ce_bound_types_to_inherited_iface , inherited_iface -> num_generic_parameters , NULL , zend_types_ht_dtor , false /* todo depend on internal or not */ );
22262226 zend_hash_add_new_ptr (ce -> bound_types , inherited_iface_lc_name , ce_bound_types_to_inherited_iface );
22272227 }
22282228 for (
22292229 uint32_t inherited_iface_generic_param_index = 0 ;
2230- inherited_iface_generic_param_index < entry -> num_generic_parameters ;
2230+ inherited_iface_generic_param_index < inherited_iface -> num_generic_parameters ;
22312231 inherited_iface_generic_param_index ++
22322232 ) {
2233- const zend_generic_parameter * inherited_generic_parameter = & entry -> generic_parameters [inherited_iface_generic_param_index ];
2233+ const zend_generic_parameter * inherited_generic_parameter = & inherited_iface -> generic_parameters [inherited_iface_generic_param_index ];
22342234 const zend_type * iface_bound_type_ptr = zend_hash_index_find_ptr (interface_bound_types , inherited_iface_generic_param_index );
22352235 ZEND_ASSERT (iface_bound_type_ptr != NULL );
22362236 zend_type bound_type ;
0 commit comments