[cfe] Remove Builder.origin and Builder.isAugmenting

Augmentations no longer have the own Builder objects so the origin and isAugmenting properties can be removed from Builder.
Lookup functions have been cleaned up accordingly.

Change-Id: Ib872d88d400906ef3ada5f7ec7cb2fb81f8ef4ac
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/416961
Reviewed-by: Jens Johansen <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/base/import.dart

@@ -92,8 +92,7 @@ class Import {
       };
     }
     NameIterator<Builder> iterator = importedLibraryBuilder!.exportNameSpace
-        .filteredNameIterator(
-            includeDuplicates: false, includeAugmentations: false);
+        .filteredNameIterator(includeDuplicates: false);
     while (iterator.moveNext()) {
       String name = iterator.name;
       Builder member = iterator.current;

pkg/front_end/lib/src/base/incremental_compiler.dart

@@ -1248,7 +1248,6 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
     Set<Uri> seenUris = new Set<Uri>();
     for (DillLibraryBuilder builder in reusedResult.notReusedLibraries) {
       if (builder.isPart) continue;
-      if (builder.isAugmenting) continue;
       if (rebuildBodies!.contains(builder)) continue;
       if (!seenUris.add(builder.importUri)) continue;
       reusedResult.reusedLibraries.add(builder);
@@ -2213,9 +2212,6 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
     // builder can exist multiple times in the values list.
     for (DillLibraryBuilder builder in builders.values) {
       if (builder.isPart) continue;
-      // TODO(jensj/ahe): This line can probably go away once
-      // https://dart-review.googlesource.com/47442 lands.
-      if (builder.isAugmenting) continue;
       if (!seenUris.add(builder.importUri)) continue;
       reusedLibraries.add(builder);
     }

pkg/front_end/lib/src/base/name_space.dart

@@ -43,30 +43,22 @@ abstract class NameSpace {
   /// Only members of type [T] are included. If [parent] is provided, on members
   /// declared in [parent] are included. If [includeDuplicates] is `true`, all
   /// duplicates of the same name are included, otherwise, only the first
-  /// declared member is included. If [includeAugmentations] is `true`, both
-  /// original and augmenting/patching members are included, otherwise, only
-  /// original members are included.
+  /// declared member is included.
   Iterator<T> filteredIterator<T extends Builder>(
-      {Builder? parent,
-      required bool includeDuplicates,
-      required bool includeAugmentations});
+      {required bool includeDuplicates});
 
   /// Returns a filtered iterator of members and setters mapped in this name
   /// space.
   ///
   /// Only members of type [T] are included. If [parent] is provided, on members
   /// declared in [parent] are included. If [includeDuplicates] is `true`, all
   /// duplicates of the same name are included, otherwise, only the first
-  /// declared member is included. If [includeAugmentations] is `true`, both
-  /// original and augmenting/patching members are included, otherwise, only
-  /// original members are included.
+  /// declared member is included.
   ///
   /// Compared to [filteredIterator] this iterator also gives access to the
   /// name that the builders are mapped to.
   NameIterator<T> filteredNameIterator<T extends Builder>(
-      {Builder? parent,
-      required bool includeDuplicates,
-      required bool includeAugmentations});
+      {required bool includeDuplicates});
 }
 
 abstract class DeclarationNameSpace implements NameSpace {
@@ -92,29 +84,21 @@ abstract class DeclarationNameSpace implements NameSpace {
   /// Only members of type [T] are included. If [parent] is provided, on members
   /// declared in [parent] are included. If [includeDuplicates] is `true`, all
   /// duplicates of the same name are included, otherwise, only the first
-  /// declared member is included. If [includeAugmentations] is `true`, both
-  /// original and augmenting/patching members are included, otherwise, only
-  /// original members are included.
+  /// declared member is included.
   Iterator<T> filteredConstructorIterator<T extends MemberBuilder>(
-      {Builder? parent,
-      required bool includeDuplicates,
-      required bool includeAugmentations});
+      {required bool includeDuplicates});
 
   /// Returns a filtered iterator of constructors mapped in this scope.
   ///
   /// Only members of type [T] are included. If [parent] is provided, on members
   /// declared in [parent] are included. If [includeDuplicates] is `true`, all
   /// duplicates of the same name are included, otherwise, only the first
-  /// declared member is included. If [includeAugmentations] is `true`, both
-  /// original and augmenting/patching members are included, otherwise, only
-  /// original members are included.
+  /// declared member is included.
   ///
   /// Compared to [filteredConstructorIterator] this iterator also gives access
   /// to the name that the builders are mapped to.
   NameIterator<T> filteredConstructorNameIterator<T extends MemberBuilder>(
-      {Builder? parent,
-      required bool includeDuplicates,
-      required bool includeAugmentations});
+      {required bool includeDuplicates});
 }
 
 class NameSpaceImpl implements NameSpace {
@@ -146,24 +130,16 @@ class NameSpaceImpl implements NameSpace {
 
   @override
   Iterator<T> filteredIterator<T extends Builder>(
-      {Builder? parent,
-      required bool includeDuplicates,
-      required bool includeAugmentations}) {
+      {required bool includeDuplicates}) {
     return new FilteredIterator<T>(unfilteredIterator,
-        parent: parent,
-        includeDuplicates: includeDuplicates,
-        includeAugmentations: includeAugmentations);
+        includeDuplicates: includeDuplicates);
   }
 
   @override
   NameIterator<T> filteredNameIterator<T extends Builder>(
-      {Builder? parent,
-      required bool includeDuplicates,
-      required bool includeAugmentations}) {
+      {required bool includeDuplicates}) {
     return new FilteredNameIterator<T>(unfilteredNameIterator,
-        parent: parent,
-        includeDuplicates: includeDuplicates,
-        includeAugmentations: includeAugmentations);
+        includeDuplicates: includeDuplicates);
   }
 
   @override
@@ -243,24 +219,16 @@ class DeclarationNameSpaceImpl extends NameSpaceImpl
 
   @override
   Iterator<T> filteredConstructorIterator<T extends MemberBuilder>(
-      {Builder? parent,
-      required bool includeDuplicates,
-      required bool includeAugmentations}) {
+      {required bool includeDuplicates}) {
     return new FilteredIterator<T>(unfilteredConstructorIterator,
-        parent: parent,
-        includeDuplicates: includeDuplicates,
-        includeAugmentations: includeAugmentations);
+        includeDuplicates: includeDuplicates);
   }
 
   @override
   NameIterator<T> filteredConstructorNameIterator<T extends MemberBuilder>(
-      {Builder? parent,
-      required bool includeDuplicates,
-      required bool includeAugmentations}) {
+      {required bool includeDuplicates}) {
     return new FilteredNameIterator<T>(unfilteredConstructorNameIterator,
-        parent: parent,
-        includeDuplicates: includeDuplicates,
-        includeAugmentations: includeAugmentations);
+        includeDuplicates: includeDuplicates);
   }
 
   @override

pkg/front_end/lib/src/base/scope.dart

@@ -556,8 +556,8 @@ class CompilationUnitPrefixScope extends BaseNameSpaceLookupScope {
   void forEachExtension(void Function(ExtensionBuilder) f) {
     if (_extensions == null) {
       Set<ExtensionBuilder> extensions = _extensions = {};
-      Iterator<PrefixBuilder> iterator = _nameSpace.filteredIterator(
-          includeDuplicates: false, includeAugmentations: false);
+      Iterator<PrefixBuilder> iterator =
+          _nameSpace.filteredIterator(includeDuplicates: false);
       while (iterator.moveNext()) {
         iterator.current.forEachExtension((e) {
           extensions.add(e);
@@ -1114,22 +1114,15 @@ class ConstructorNameSpaceNameIterator extends ConstructorNameSpaceIterator
 /// Filtered builder [Iterator].
 class FilteredIterator<T extends Builder> implements Iterator<T> {
   final Iterator<Builder> _iterator;
-  final Builder? parent;
   final bool includeDuplicates;
-  final bool includeAugmentations;
 
-  FilteredIterator(this._iterator,
-      {required this.parent,
-      required this.includeDuplicates,
-      required this.includeAugmentations});
+  FilteredIterator(this._iterator, {required this.includeDuplicates});
 
   bool _include(Builder element) {
-    if (parent != null && element.parent != parent) return false;
     if (!includeDuplicates &&
         (element.isDuplicate || element.isConflictingAugmentationMember)) {
       return false;
     }
-    if (!includeAugmentations && element.isAugmenting) return false;
     return element is T;
   }
 
@@ -1154,22 +1147,15 @@ class FilteredIterator<T extends Builder> implements Iterator<T> {
 /// access to the name that the builders are mapped to.
 class FilteredNameIterator<T extends Builder> implements NameIterator<T> {
   final NameIterator<Builder> _iterator;
-  final Builder? parent;
   final bool includeDuplicates;
-  final bool includeAugmentations;
 
-  FilteredNameIterator(this._iterator,
-      {required this.parent,
-      required this.includeDuplicates,
-      required this.includeAugmentations});
+  FilteredNameIterator(this._iterator, {required this.includeDuplicates});
 
   bool _include(Builder element) {
-    if (parent != null && element.parent != parent) return false;
     if (!includeDuplicates &&
         (element.isDuplicate || element.isConflictingAugmentationMember)) {
       return false;
     }
-    if (!includeAugmentations && element.isAugmenting) return false;
     return element is T;
   }
 

pkg/front_end/lib/src/builder/builder.dart

@@ -16,8 +16,6 @@ abstract class Builder {
 
   int get fileOffset;
 
-  Builder get origin;
-
   String get fullNameForErrors;
 
   bool get hasProblem;
@@ -218,17 +216,6 @@ abstract class Builder {
 
   bool get isLocal;
 
-  /// Returns `true` if this builder is augmenting another builder.
-  ///
-  /// If `true`, the augmented builder is found through [origin] which is
-  /// a different builder than this builder.
-  ///
-  /// A class/member builder can be augmented through 'augment' modifier in
-  /// augmentation libraries or through the `@patch` annotation in patch
-  /// libraries. A library builder can be augmented through the augmentation
-  /// libraries feature or through patch libraries.
-  bool get isAugmenting;
-
   /// Returns `true` if the related declaration is marked `augment`
   bool get isAugment;
 
@@ -266,9 +253,6 @@ abstract class BuilderImpl implements Builder {
 
   BuilderImpl();
 
-  @override
-  Builder get origin => this;
-
   @override
   bool get hasProblem => false;
 
@@ -322,9 +306,6 @@ abstract class BuilderImpl implements Builder {
   @override
   bool get isLocal => false;
 
-  @override
-  bool get isAugmenting => false;
-
   @override
   bool get isAugment => false;
 

pkg/front_end/lib/src/builder/builder_mixins.dart

@@ -23,8 +23,8 @@ mixin DeclarationBuilderMixin implements IDeclarationBuilder {
   Builder? findStaticBuilder(
       String name, int charOffset, Uri fileUri, LibraryBuilder accessingLibrary,
       {bool isSetter = false}) {
-    if (accessingLibrary.nameOriginBuilder.origin !=
-            libraryBuilder.nameOriginBuilder.origin &&
+    if (accessingLibrary.nameOriginBuilder !=
+            libraryBuilder.nameOriginBuilder &&
         name.startsWith("_")) {
       return null;
     }
@@ -68,10 +68,7 @@ mixin DeclarationBuilderMixin implements IDeclarationBuilder {
   }
 
   void forEach(void f(String name, Builder builder)) {
-    nameSpace
-        .filteredNameIterator(
-            includeDuplicates: false, includeAugmentations: false)
-        .forEach(f);
+    nameSpace.filteredNameIterator(includeDuplicates: false).forEach(f);
   }
 
   @override

pkg/front_end/lib/src/builder/class_builder.dart

@@ -133,9 +133,6 @@ abstract class ClassBuilder implements DeclarationBuilder, ClassMemberAccess {
   /// Reference for the class built by this builder.
   Reference get reference;
 
-  @override
-  ClassBuilder get origin;
-
   abstract bool isNullClass;
 
   @override
@@ -187,8 +184,8 @@ abstract class ClassBuilderImpl extends DeclarationBuilderImpl
   Builder? findStaticBuilder(
       String name, int fileOffset, Uri fileUri, LibraryBuilder accessingLibrary,
       {bool isSetter = false}) {
-    if (accessingLibrary.nameOriginBuilder.origin !=
-            libraryBuilder.nameOriginBuilder.origin &&
+    if (accessingLibrary.nameOriginBuilder !=
+            libraryBuilder.nameOriginBuilder &&
         name.startsWith("_")) {
       return null;
     }
@@ -206,23 +203,13 @@ abstract class ClassBuilderImpl extends DeclarationBuilderImpl
           isSetter: isSetter,
           forStaticAccess: true);
     }
-    if (declaration == null && isAugmenting) {
-      // Coverage-ignore-block(suite): Not run.
-      return origin.findStaticBuilder(
-          name, fileOffset, fileUri, accessingLibrary,
-          isSetter: isSetter);
-    }
     return declaration;
   }
 
   @override
   Builder? lookupLocalMember(String name,
       {bool setter = false, bool required = false}) {
     Builder? builder = nameSpace.lookupLocalMember(name, setter: setter);
-    if (builder == null && isAugmenting) {
-      // Coverage-ignore-block(suite): Not run.
-      builder = origin.nameSpace.lookupLocalMember(name, setter: setter);
-    }
     if (required && builder == null) {
       internalProblem(
           templateInternalProblemNotFoundIn.withArguments(
@@ -374,11 +361,6 @@ abstract class ClassBuilderImpl extends DeclarationBuilderImpl
   @override
   Supertype buildMixedInType(
       LibraryBuilder library, List<TypeBuilder>? arguments) {
-    Class cls = isAugmenting
-        ?
-        // Coverage-ignore(suite): Not run.
-        origin.cls
-        : this.cls;
     if (arguments != null) {
       List<DartType> typeArguments =
           buildAliasedTypeArguments(library, arguments, /* hierarchy = */ null);
@@ -405,26 +387,6 @@ abstract class ClassBuilderImpl extends DeclarationBuilderImpl
   Member? lookupInstanceMember(ClassHierarchy hierarchy, Name name,
       {bool isSetter = false, bool isSuper = false}) {
     Class? instanceClass = cls;
-    if (isAugmenting) {
-      // Coverage-ignore-block(suite): Not run.
-      assert(identical(instanceClass, origin.cls),
-          "Found ${origin.cls} expected $instanceClass");
-      if (isSuper) {
-        // The super class is only correctly found through the origin class.
-        instanceClass = origin.cls;
-      } else {
-        Member? member =
-            hierarchy.getInterfaceMember(instanceClass, name, setter: isSetter);
-        if (member?.parent == instanceClass) {
-          // Only if the member is found in the augmentation can we use it.
-          return member;
-        } else {
-          // Otherwise, we need to keep searching in the origin class.
-          instanceClass = origin.cls;
-        }
-      }
-    }
-
     if (isSuper) {
       instanceClass = instanceClass.superclass;
       if (instanceClass == null) return null;