Version 3.3.0-124.0.dev

Merge 57a2fb6 into dev
dart-lang · Nov 13, 2023 · 95da64a · 95da64a
2 parents 1a1b9cb + 57a2fb6
commit 95da64a
Show file tree

Hide file tree

Showing 10 changed files with 270 additions and 35 deletions.
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -232,7 +232,7 @@ abstract class AugmentedInterfaceElementImpl
 
   @override
   // TODO: implement declaration
-  InterfaceElement get declaration => throw UnimplementedError();
+  InterfaceElementImpl get declaration => throw UnimplementedError();
 
   @override
   // TODO: implement unnamedConstructor

diff --git a/pkg/analyzer/lib/src/dart/element/type_algebra.dart b/pkg/analyzer/lib/src/dart/element/type_algebra.dart
@@ -160,8 +160,12 @@ abstract class Substitution {
 
   DartType? getSubstitute(TypeParameterElement parameter, bool upperBound);
 
+  InterfaceType mapInterfaceType(InterfaceType type) {
+    return substituteType(type) as InterfaceType;
+  }
+
   Iterable<InterfaceType> mapInterfaceTypes(Iterable<InterfaceType> types) {
-    return types.map(substituteType).whereType();
+    return types.map(mapInterfaceType);
   }
 
   DartType substituteType(DartType type, {bool contravariant = false}) {

diff --git a/pkg/analyzer/lib/src/summary2/library_builder.dart b/pkg/analyzer/lib/src/summary2/library_builder.dart
@@ -642,6 +642,35 @@ class LibraryBuilder {
     }
   }
 
+  void setDefaultSupertypes() {
+    var shouldResetClassHierarchies = false;
+    final objectType = element.typeProvider.objectType;
+    for (final interface in element.topLevelElements) {
+      switch (interface) {
+        case ClassElementImpl():
+          if (interface.isAugmentation) continue;
+          if (interface.isDartCoreObject) continue;
+          if (interface.supertype == null) {
+            shouldResetClassHierarchies = true;
+            interface.supertype = objectType;
+          }
+        case MixinElementImpl():
+          if (interface.isAugmentation) continue;
+          final augmented = interface.augmented!;
+          if (augmented.superclassConstraints.isEmpty) {
+            shouldResetClassHierarchies = true;
+            interface.superclassConstraints = [objectType];
+            if (augmented is AugmentedMixinElementImpl) {
+              augmented.superclassConstraints = [objectType];
+            }
+          }
+      }
+    }
+    if (shouldResetClassHierarchies) {
+      element.session.classHierarchy.removeOfLibraries({uri});
+    }
+  }
+
   void storeExportScope() {
     element.exportedReferences = exportScope.toReferences();
 

diff --git a/pkg/analyzer/lib/src/summary2/link.dart b/pkg/analyzer/lib/src/summary2/link.dart
@@ -161,6 +161,7 @@ class Linker {
 
     _createTypeSystem();
     _resolveTypes();
+    _setDefaultSupertypes();
 
     await performance.runAsync(
       'executeMacroDeclarationsPhase',
@@ -374,6 +375,12 @@ class Linker {
     TypesBuilder(this).build(nodesToBuildType);
   }
 
+  void _setDefaultSupertypes() {
+    for (final library in builders.values) {
+      library.setDefaultSupertypes();
+    }
+  }
+
   void _writeLibraries() {
     var bundleWriter = BundleWriter(
       elementFactory.dynamicRef,

diff --git a/pkg/analyzer/lib/src/summary2/types_builder.dart b/pkg/analyzer/lib/src/summary2/types_builder.dart
@@ -132,13 +132,9 @@ class TypesBuilder {
       var type = extendsClause.superclass.type;
       if (type is InterfaceType && _isInterfaceTypeClass(type)) {
         element.supertype = type;
-      } else {
-        element.supertype = _objectType(element);
       }
-    } else if (element.library.isDartCore && element.name == 'Object') {
+    } else if (element.isDartCoreObject) {
       element.setModifier(Modifier.DART_CORE_OBJECT, true);
-    } else {
-      element.supertype = _objectType(element);
     }
 
     element.interfaces = _toInterfaceTypeList(
@@ -158,8 +154,6 @@ class TypesBuilder {
     var superType = node.superclass.type;
     if (superType is InterfaceType && _isInterfaceTypeClass(superType)) {
       element.supertype = superType;
-    } else {
-      element.supertype = _objectType(element);
     }
 
     element.mixins = _toInterfaceTypeList(
@@ -346,9 +340,6 @@ class TypesBuilder {
     var constraints = _toInterfaceTypeList(
       node.onClause?.superclassConstraints,
     );
-    if (!element.isAugmentation && constraints.isEmpty) {
-      constraints = [_objectType(element)];
-    }
     element.superclassConstraints = constraints;
 
     element.interfaces = _toInterfaceTypeList(
@@ -449,7 +440,16 @@ class TypesBuilder {
     final typeProvider = element.library.typeProvider;
 
     if (element is InterfaceElementImpl &&
-        augmented is AugmentedInterfaceElementImpl) {
+        augmented is AugmentedInterfaceElementImpl &&
+        declaration is InterfaceElementImpl) {
+      if (declaration.supertype == null) {
+        final elementSuperType = element.supertype;
+        if (elementSuperType != null) {
+          final superType = toDeclaration.mapInterfaceType(elementSuperType);
+          declaration.supertype = superType;
+        }
+      }
+
       augmented.interfaces.addAll(
         toDeclaration.mapInterfaceTypes(element.interfaces),
       );
@@ -509,10 +509,6 @@ class TypesBuilder {
       nullabilitySuffix: NullabilitySuffix.none,
     );
   }
-
-  static InterfaceType _objectType(InterfaceElementImpl element) {
-    return element.library.typeProvider.objectType;
-  }
 }
 
 /// Performs mixins inference in a [ClassDeclaration].

diff --git a/pkg/analyzer/test/src/summary/element_text.dart b/pkg/analyzer/test/src/summary/element_text.dart
@@ -41,6 +41,7 @@ String getLibraryText({
 
 class ElementTextConfiguration {
   bool Function(Object) filter;
+  bool withAllSupertypes = false;
   bool withAugmentedWithoutAugmentation = false;
   bool withCodeRanges = false;
   bool withConstantInitializers = true;
@@ -637,21 +638,20 @@ class _ElementWriter {
       }
 
       if (e is MixinElementImpl) {
-        final superclassConstraints = e.superclassConstraints;
-        if (!e.isAugmentation) {
-          if (superclassConstraints.isEmpty) {
-            throw StateError('At least Object is expected.');
-          }
-        }
         _elementPrinter.writeTypeList(
           'superclassConstraints',
-          superclassConstraints,
+          e.superclassConstraints,
         );
       }
 
       _elementPrinter.writeTypeList('mixins', e.mixins);
       _elementPrinter.writeTypeList('interfaces', e.interfaces);
 
+      if (configuration.withAllSupertypes) {
+        final sorted = e.allSupertypes.sortedBy((t) => t.element.name);
+        _elementPrinter.writeTypeList('allSupertypes', sorted);
+      }
+
       _writeElements('fields', e.fields, _writePropertyInducingElement);
 
       var constructors = e.constructors;