Elements. Return List<InterfaceTypeImpl> from InterfaceElementImpl2.allSupertypes

Change-Id: I6c62a146c56ab22e3be9e777f3f968bd218ca5ca
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429823
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/dart/element/class_hierarchy.dart

@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/element/nullability_suffix.dart';
-import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/type_algebra.dart';
@@ -17,7 +16,7 @@ class ClassHierarchy {
     return _getHierarchy(element).errors;
   }
 
-  List<InterfaceType> implementedInterfaces(InterfaceElementImpl2 element) {
+  List<InterfaceTypeImpl> implementedInterfaces(InterfaceElementImpl2 element) {
     return _getHierarchy(element).interfaces;
   }
 
@@ -45,7 +44,7 @@ class ClassHierarchy {
 
     hierarchy = _Hierarchy(
       errors: const <ClassHierarchyError>[],
-      interfaces: const <InterfaceType>[],
+      interfaces: const <InterfaceTypeImpl>[],
     );
     _map[element] = hierarchy;
 
@@ -82,7 +81,7 @@ class ClassHierarchy {
     }
 
     var errors = <ClassHierarchyError>[];
-    var interfaces = <InterfaceType>[];
+    var interfaces = <InterfaceTypeImpl>[];
     for (var collector in interfacesMerger._map.values) {
       var error = collector._error;
       if (error != null) {
@@ -111,8 +110,8 @@ abstract class ClassHierarchyError {}
 /// In opted-in libraries NNBD_TOP_MERGE of NORM of the interfaces must be
 /// successful.
 class IncompatibleInterfacesClassHierarchyError extends ClassHierarchyError {
-  final InterfaceType first;
-  final InterfaceType second;
+  final InterfaceTypeImpl first;
+  final InterfaceTypeImpl second;
 
   IncompatibleInterfacesClassHierarchyError(this.first, this.second);
 }
@@ -207,7 +206,7 @@ class _ClassInterfaceType {
 
 class _Hierarchy {
   List<ClassHierarchyError> errors;
-  List<InterfaceType> interfaces;
+  List<InterfaceTypeImpl> interfaces;
 
   _Hierarchy({required this.errors, required this.interfaces});
 }

pkg/analyzer/lib/src/dart/element/element.dart

@@ -4957,10 +4957,10 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
   InterfaceTypeImpl? _thisType;
 
   /// The cached result of [allSupertypes].
-  List<InterfaceType>? _allSupertypes;
+  List<InterfaceTypeImpl>? _allSupertypes;
 
   @override
-  List<InterfaceType> get allSupertypes {
+  List<InterfaceTypeImpl> get allSupertypes {
     return _allSupertypes ??= library2.session.classHierarchy
         .implementedInterfaces(this);
   }

pkg/analyzer/lib/src/fine/library_manifest.dart

@@ -7,7 +7,6 @@ import 'dart:typed_data';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/analysis/file_state.dart';
 import 'package:analyzer/src/dart/element/element.dart';
-import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/fine/lookup_name.dart';
 import 'package:analyzer/src/fine/manifest_context.dart';
 import 'package:analyzer/src/fine/manifest_id.dart';
@@ -754,7 +753,6 @@ class LibraryManifestBuilder {
 
       // Ensure that we have interfaces of supertypes first.
       for (var superType in element.allSupertypes) {
-        superType as InterfaceTypeImpl;
         addInterfacesToFill(superType.element3);
       }