Elements. Don't store 'InstanceElementImpl2.methods', build from 'methods2'.

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

Author: scheglov

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

@@ -5340,9 +5340,6 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   @override
   List<PropertyAccessorElement> accessors = [];
 
-  @override
-  List<MethodElement> methods = [];
-
   @override
   List<MethodElementImpl2> methods2 = [];
 
@@ -5409,6 +5406,42 @@ abstract class InstanceElementImpl2 extends ElementImpl2
   @override
   Metadata get metadata2 => firstFragment.metadata2;
 
+  @override
+  List<MethodElement> get methods {
+    return methods2.map((element) {
+      var firstTypeParameters = firstFragment.typeParameters;
+
+      var lastFragment = element.lastFragment;
+      var lastInstance = lastFragment.enclosingFragment;
+      if (identical(lastInstance, firstFragment)) {
+        return lastFragment;
+      }
+
+      var lastTypeParameters = lastInstance.typeParameters2;
+      if (firstTypeParameters.isEmpty && lastTypeParameters.isEmpty) {
+        return lastFragment;
+      }
+
+      MapSubstitution toFirstFragment;
+      if (lastTypeParameters.length == firstTypeParameters.length) {
+        toFirstFragment = Substitution.fromPairs(
+          lastTypeParameters,
+          firstTypeParameters.instantiateNone(),
+        );
+      } else {
+        toFirstFragment = Substitution.fromPairs(
+          lastTypeParameters,
+          List.filled(
+            lastTypeParameters.length,
+            InvalidTypeImpl.instance,
+          ),
+        );
+      }
+
+      return MethodMember(lastFragment, toFirstFragment, Substitution.empty);
+    }).toList();
+  }
+
   @override
   String? get name3 => firstFragment.name;
 
@@ -7640,8 +7673,8 @@ class MethodElementImpl extends ExecutableElementImpl
   }
 
   @override
-  InstanceFragment? get enclosingFragment =>
-      enclosingElement3 as InstanceFragment;
+  InstanceElementImpl get enclosingFragment =>
+      enclosingElement3 as InstanceElementImpl;
 
   /// Set whether this class is abstract.
   set isAbstract(bool isAbstract) {
@@ -7674,7 +7707,7 @@ class MethodElementImpl extends ExecutableElementImpl
   }
 
   @override
-  MethodFragment? get nextFragment => augmentation;
+  MethodElementImpl? get nextFragment => augmentation;
 
   @override
   Element get nonSynthetic {
@@ -7685,7 +7718,7 @@ class MethodElementImpl extends ExecutableElementImpl
   }
 
   @override
-  MethodFragment? get previousFragment => augmentationTarget;
+  MethodElementImpl? get previousFragment => augmentationTarget;
 
   @override
   T? accept<T>(ElementVisitor<T> visitor) => visitor.visitMethodElement(this);
@@ -7726,6 +7759,17 @@ class MethodElementImpl2 extends ExecutableElementImpl2
   @override
   ElementKind get kind => ElementKind.METHOD;
 
+  MethodElementImpl get lastFragment {
+    var lastFragment = firstFragment;
+    while (true) {
+      if (lastFragment.nextFragment case var nextFragment?) {
+        lastFragment = nextFragment;
+      } else {
+        return lastFragment;
+      }
+    }
+  }
+
   @override
   T? accept2<T>(ElementVisitor2<T> visitor) {
     return visitor.visitMethodElement(this);
@@ -10583,8 +10627,8 @@ mixin TypeParameterizedElementMixin on ElementImpl
   }
 
   @override
-  List<TypeParameterFragment> get typeParameters2 =>
-      typeParameters.cast<TypeParameterFragment>();
+  List<TypeParameterElementImpl> get typeParameters2 =>
+      typeParameters.cast<TypeParameterElementImpl>();
 
   List<TypeParameterElement> get typeParameters_unresolved {
     return _typeParameters;

pkg/analyzer/lib/src/summary2/augmentation.dart

@@ -269,7 +269,6 @@ abstract class InstanceElementBuilder<E extends InstanceElementImpl2,
 
     augmented.fields.addAll(firstFragment.fields);
     augmented.accessors.addAll(firstFragment.accessors);
-    augmented.methods.addAll(firstFragment.methods);
 
     if (augmented is InterfaceElementImpl2) {
       if (firstFragment is InterfaceElementImpl) {
@@ -359,16 +358,6 @@ abstract class InstanceElementBuilder<E extends InstanceElementImpl2,
             element, toFirstFragment, Substitution.empty);
       }),
     ];
-
-    element.methods = [
-      ...element.methods.notAugmented,
-      ...augmentation.methods.notAugmented.map((element) {
-        if (toFirstFragment.map.isEmpty) {
-          return element;
-        }
-        return MethodMember(element, toFirstFragment, Substitution.empty);
-      }),
-    ];
   }
 }
 

pkg/analyzer/lib/src/summary2/bundle_reader.dart

@@ -147,7 +147,6 @@ class ClassElementLinkedData extends ElementLinkedData<ClassElementImpl> {
       augmented.fields = reader.readElementList();
       augmented.constructors = reader.readElementList();
       augmented.accessors = reader.readElementList();
-      augmented.methods = reader.readElementList();
     }
 
     applyConstantOffsets?.perform();
@@ -372,7 +371,6 @@ class EnumElementLinkedData extends ElementLinkedData<EnumElementImpl> {
       augmented.fields = reader.readElementList();
       augmented.constructors = reader.readElementList();
       augmented.accessors = reader.readElementList();
-      augmented.methods = reader.readElementList();
     }
     applyConstantOffsets?.perform();
   }
@@ -405,7 +403,6 @@ class ExtensionElementLinkedData
       var augmented = element.augmentedInternal;
       augmented.fields = reader.readElementList();
       augmented.accessors = reader.readElementList();
-      augmented.methods = reader.readElementList();
       augmented.extendedType = extendedType;
     }
 
@@ -442,7 +439,6 @@ class ExtensionTypeElementLinkedData
       augmented.fields = reader.readElementList();
       augmented.accessors = reader.readElementList();
       augmented.constructors = reader.readElementList();
-      augmented.methods = reader.readElementList();
       augmented
         ..primaryConstructor = element.constructors.first
         ..representation = element.fields.first
@@ -1946,7 +1942,6 @@ class MixinElementLinkedData extends ElementLinkedData<MixinElementImpl> {
       augmented.interfaces = reader._readInterfaceTypeList();
       augmented.fields = reader.readElementList();
       augmented.accessors = reader.readElementList();
-      augmented.methods = reader.readElementList();
     }
 
     applyConstantOffsets?.perform();

pkg/analyzer/lib/src/summary2/bundle_writer.dart

@@ -165,7 +165,6 @@ class BundleWriter {
         _resolutionSink._writeElementList(augmented.fields);
         _resolutionSink._writeElementList(augmented.constructors);
         _resolutionSink._writeElementList(augmented.accessors);
-        _resolutionSink._writeElementList(augmented.methods);
       }
 
       if (!element.isMixinApplication) {
@@ -258,7 +257,6 @@ class BundleWriter {
         _resolutionSink._writeElementList(augmented.fields);
         _resolutionSink._writeElementList(augmented.constructors);
         _resolutionSink._writeElementList(augmented.accessors);
-        _resolutionSink._writeElementList(augmented.methods);
       }
 
       _writeList(
@@ -320,7 +318,6 @@ class BundleWriter {
         _resolutionSink.writeType(augmented.extendedType);
         _resolutionSink._writeElementList(augmented.fields);
         _resolutionSink._writeElementList(augmented.accessors);
-        _resolutionSink._writeElementList(augmented.methods);
       }
 
       _writeList(
@@ -353,7 +350,6 @@ class BundleWriter {
         _resolutionSink._writeElementList(augmented.fields);
         _resolutionSink._writeElementList(augmented.accessors);
         _resolutionSink._writeElementList(augmented.constructors);
-        _resolutionSink._writeElementList(augmented.methods);
         _resolutionSink.writeType(augmented.typeErasure);
       }
 
@@ -532,7 +528,6 @@ class BundleWriter {
         _resolutionSink._writeTypeList(augmented.interfaces);
         _resolutionSink._writeElementList(augmented.fields);
         _resolutionSink._writeElementList(augmented.accessors);
-        _resolutionSink._writeElementList(augmented.methods);
       }
 
       _writeList(

pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart

@@ -925,7 +925,14 @@ class _MockSdkElementsBuilder {
     element.fields = fragment.fields;
     element.constructors = fragment.constructors;
     element.accessors = fragment.accessors;
-    element.methods = fragment.methods;
+
+    element.methods2 = fragment.methods.map((firstFragment) {
+      return MethodElementImpl2(
+        Reference.root(),
+        firstFragment.name2,
+        firstFragment,
+      );
+    }).toList();
   }
 
   LibraryElementImpl _buildCore() {

pkg/analyzer/test/generated/elements_types_mixin.dart

@@ -147,7 +147,6 @@ mixin ElementsTypesMixin {
     var element = ClassElementImpl2(Reference.root(), fragment);
     element.mixins = fragment.mixins;
     element.interfaces = fragment.interfaces;
-    element.methods = fragment.methods;
 
     return fragment;
   }
@@ -434,7 +433,6 @@ mixin ElementsTypesMixin {
     var element = MixinElementImpl2(Reference.root(), fragment);
     element.superclassConstraints = fragment.superclassConstraints;
     element.interfaces = fragment.interfaces;
-    element.methods = fragment.methods;
 
     return fragment;
   }