[cfe] Move parent, fileUri, and charOffset to MemberBuilder subclasses

Change-Id: I3bc30c2e12c52f6886260068f6d0f852985b7973
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/390220
Reviewed-by: Chloe Stefantsova <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>

Author: johnniwinther

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

@@ -90,49 +90,12 @@ abstract class MemberBuilder implements Builder {
 
 abstract class MemberBuilderImpl extends BuilderImpl implements MemberBuilder {
   @override
-  String get name;
-
-  /// For top-level members, the parent is set correctly during
-  /// construction. However, for class members, the parent is initially the
-  /// library and updated later.
-  @override
-  Builder parent;
-
-  @override
-  final int charOffset;
-
-  @override
-  final Uri fileUri;
-
-  MemberBuilderImpl(this.parent, this.fileUri, this.charOffset);
+  Uri get fileUri;
 
   @override
-  DeclarationBuilder? get declarationBuilder =>
-      parent is DeclarationBuilder ? parent as DeclarationBuilder : null;
-
-  @override
-  ClassBuilder? get classBuilder =>
-      parent is ClassBuilder ? parent as ClassBuilder : null;
-
-  @override
-  LibraryBuilder get libraryBuilder {
-    if (parent is LibraryBuilder) {
-      LibraryBuilder library = parent as LibraryBuilder;
-      return library.partOfLibrary ?? library;
-    }
-    // Coverage-ignore(suite): Not run.
-    else if (parent is ExtensionBuilder) {
-      ExtensionBuilder extension = parent as ExtensionBuilder;
-      return extension.libraryBuilder;
-    } else if (parent is ExtensionTypeDeclarationBuilder) {
-      ExtensionTypeDeclarationBuilder extensionTypeDeclaration =
-          parent as ExtensionTypeDeclarationBuilder;
-      return extensionTypeDeclaration.libraryBuilder;
-    } else {
-      ClassBuilder cls = parent as ClassBuilder;
-      return cls.libraryBuilder;
-    }
-  }
+  ClassBuilder? get classBuilder => declarationBuilder is ClassBuilder
+      ? declarationBuilder as ClassBuilder
+      : null;
 
   @override
   bool get isDeclarationInstanceMember => isDeclarationMember && !isStatic;

pkg/front_end/lib/src/dill/dill_class_builder.dart

@@ -158,22 +158,23 @@ class DillClassBuilder extends ClassBuilderImpl
   List<TypeBuilder>? get onTypes => null;
 
   void addField(Field field) {
-    DillFieldBuilder builder = new DillFieldBuilder(field, this);
+    DillFieldBuilder builder =
+        new DillFieldBuilder(field, libraryBuilder, this);
     String name = field.name.text;
     nameSpace.addLocalMember(name, builder, setter: false);
   }
 
   void addConstructor(Constructor constructor, Procedure? constructorTearOff) {
-    DillConstructorBuilder builder =
-        new DillConstructorBuilder(constructor, constructorTearOff, this);
+    DillConstructorBuilder builder = new DillConstructorBuilder(
+        constructor, constructorTearOff, libraryBuilder, this);
     String name = constructor.name.text;
     nameSpace.addConstructor(name, builder);
   }
 
   void addFactory(Procedure factory, Procedure? factoryTearOff) {
     String name = factory.name.text;
-    nameSpace.addConstructor(
-        name, new DillFactoryBuilder(factory, factoryTearOff, this));
+    nameSpace.addConstructor(name,
+        new DillFactoryBuilder(factory, factoryTearOff, libraryBuilder, this));
   }
 
   void addProcedure(Procedure procedure) {
@@ -183,19 +184,23 @@ class DillClassBuilder extends ClassBuilderImpl
         // Coverage-ignore(suite): Not run.
         throw new UnsupportedError("Use addFactory for adding factories");
       case ProcedureKind.Setter:
-        nameSpace.addLocalMember(name, new DillSetterBuilder(procedure, this),
+        nameSpace.addLocalMember(
+            name, new DillSetterBuilder(procedure, libraryBuilder, this),
             setter: true);
         break;
       case ProcedureKind.Getter:
-        nameSpace.addLocalMember(name, new DillGetterBuilder(procedure, this),
+        nameSpace.addLocalMember(
+            name, new DillGetterBuilder(procedure, libraryBuilder, this),
             setter: false);
         break;
       case ProcedureKind.Operator:
-        nameSpace.addLocalMember(name, new DillOperatorBuilder(procedure, this),
+        nameSpace.addLocalMember(
+            name, new DillOperatorBuilder(procedure, libraryBuilder, this),
             setter: false);
         break;
       case ProcedureKind.Method:
-        nameSpace.addLocalMember(name, new DillMethodBuilder(procedure, this),
+        nameSpace.addLocalMember(
+            name, new DillMethodBuilder(procedure, libraryBuilder, this),
             setter: false);
         break;
     }

pkg/front_end/lib/src/dill/dill_extension_builder.dart

@@ -16,7 +16,7 @@ import 'dill_library_builder.dart';
 class DillExtensionBuilder extends ExtensionBuilderImpl
     with DillDeclarationBuilderMixin {
   @override
-  final DillLibraryBuilder parent;
+  final DillLibraryBuilder libraryBuilder;
 
   @override
   final Extension extension;
@@ -30,7 +30,7 @@ class DillExtensionBuilder extends ExtensionBuilderImpl
   List<NominalVariableBuilder>? _typeParameters;
   TypeBuilder? _onType;
 
-  DillExtensionBuilder(this.extension, this.parent)
+  DillExtensionBuilder(this.extension, this.libraryBuilder)
       : _nameSpace = new DeclarationNameSpaceImpl() {
     _scope = new NameSpaceLookupScope(
         _nameSpace, ScopeKind.declaration, "extension ${extension.name}",
@@ -46,7 +46,7 @@ class DillExtensionBuilder extends ExtensionBuilderImpl
             nameSpace.addLocalMember(
                 name.text,
                 new DillExtensionStaticMethodBuilder(
-                    procedure, descriptor, this),
+                    procedure, descriptor, libraryBuilder, this),
                 setter: false);
           } else {
             Procedure procedure = descriptor.memberReference.asProcedure;
@@ -55,38 +55,49 @@ class DillExtensionBuilder extends ExtensionBuilderImpl
             nameSpace.addLocalMember(
                 name.text,
                 new DillExtensionInstanceMethodBuilder(
-                    procedure, descriptor, this, tearOff!),
+                    procedure, descriptor, libraryBuilder, this, tearOff!),
                 setter: false);
           }
           break;
         case ExtensionMemberKind.Getter:
           Procedure procedure = descriptor.memberReference.asProcedure;
-          nameSpace.addLocalMember(name.text,
-              new DillExtensionGetterBuilder(procedure, descriptor, this),
+          nameSpace.addLocalMember(
+              name.text,
+              new DillExtensionGetterBuilder(
+                  procedure, descriptor, libraryBuilder, this),
               setter: false);
           break;
         case ExtensionMemberKind.Field:
           Field field = descriptor.memberReference.asField;
           nameSpace.addLocalMember(
-              name.text, new DillExtensionFieldBuilder(field, descriptor, this),
+              name.text,
+              new DillExtensionFieldBuilder(
+                  field, descriptor, libraryBuilder, this),
               setter: false);
           break;
         case ExtensionMemberKind.Setter:
           Procedure procedure = descriptor.memberReference.asProcedure;
-          nameSpace.addLocalMember(name.text,
-              new DillExtensionSetterBuilder(procedure, descriptor, this),
+          nameSpace.addLocalMember(
+              name.text,
+              new DillExtensionSetterBuilder(
+                  procedure, descriptor, libraryBuilder, this),
               setter: true);
           break;
         case ExtensionMemberKind.Operator:
           Procedure procedure = descriptor.memberReference.asProcedure;
-          nameSpace.addLocalMember(name.text,
-              new DillExtensionOperatorBuilder(procedure, descriptor, this),
+          nameSpace.addLocalMember(
+              name.text,
+              new DillExtensionOperatorBuilder(
+                  procedure, descriptor, libraryBuilder, this),
               setter: false);
           break;
       }
     }
   }
 
+  @override
+  DillLibraryBuilder get parent => libraryBuilder;
+
   @override
   Reference get reference => extension.reference;
 

pkg/front_end/lib/src/dill/dill_extension_member_builder.dart

@@ -4,14 +4,14 @@
 
 import 'package:kernel/ast.dart';
 
-import '../builder/builder.dart';
+import 'dill_extension_builder.dart';
 import 'dill_member_builder.dart';
 
 abstract class DillExtensionMemberBuilder extends DillMemberBuilder {
   final ExtensionMemberDescriptor _descriptor;
 
-  DillExtensionMemberBuilder(Member member, this._descriptor, Builder parent)
-      : super(member, parent);
+  DillExtensionMemberBuilder(this._descriptor, super.libraryBuilder,
+      DillExtensionBuilder super.declarationBuilder);
 
   @override
   bool get isStatic => _descriptor.isStatic;
@@ -44,9 +44,8 @@ abstract class DillExtensionMemberBuilder extends DillMemberBuilder {
 class DillExtensionFieldBuilder extends DillExtensionMemberBuilder {
   final Field field;
 
-  DillExtensionFieldBuilder(
-      this.field, ExtensionMemberDescriptor descriptor, Builder parent)
-      : super(field, descriptor, parent);
+  DillExtensionFieldBuilder(this.field, super.descriptor, super.libraryBuilder,
+      super.declarationBuilder);
 
   @override
   // Coverage-ignore(suite): Not run.
@@ -71,10 +70,9 @@ class DillExtensionFieldBuilder extends DillExtensionMemberBuilder {
 class DillExtensionSetterBuilder extends DillExtensionMemberBuilder {
   final Procedure procedure;
 
-  DillExtensionSetterBuilder(
-      this.procedure, ExtensionMemberDescriptor descriptor, Builder parent)
-      : assert(descriptor.kind == ExtensionMemberKind.Setter),
-        super(procedure, descriptor, parent);
+  DillExtensionSetterBuilder(this.procedure, super.descriptor,
+      super.libraryBuilder, super.declarationBuilder)
+      : assert(descriptor.kind == ExtensionMemberKind.Setter);
 
   @override
   // Coverage-ignore(suite): Not run.
@@ -94,10 +92,9 @@ class DillExtensionSetterBuilder extends DillExtensionMemberBuilder {
 class DillExtensionGetterBuilder extends DillExtensionMemberBuilder {
   final Procedure procedure;
 
-  DillExtensionGetterBuilder(
-      this.procedure, ExtensionMemberDescriptor descriptor, Builder parent)
-      : assert(descriptor.kind == ExtensionMemberKind.Getter),
-        super(procedure, descriptor, parent);
+  DillExtensionGetterBuilder(this.procedure, super.descriptor,
+      super.libraryBuilder, super.declarationBuilder)
+      : assert(descriptor.kind == ExtensionMemberKind.Getter);
 
   @override
   // Coverage-ignore(suite): Not run.
@@ -117,10 +114,9 @@ class DillExtensionGetterBuilder extends DillExtensionMemberBuilder {
 class DillExtensionOperatorBuilder extends DillExtensionMemberBuilder {
   final Procedure procedure;
 
-  DillExtensionOperatorBuilder(
-      this.procedure, ExtensionMemberDescriptor descriptor, Builder parent)
-      : assert(descriptor.kind == ExtensionMemberKind.Operator),
-        super(procedure, descriptor, parent);
+  DillExtensionOperatorBuilder(this.procedure, super.descriptor,
+      super.libraryBuilder, super.declarationBuilder)
+      : assert(descriptor.kind == ExtensionMemberKind.Operator);
 
   @override
   // Coverage-ignore(suite): Not run.
@@ -140,11 +136,10 @@ class DillExtensionOperatorBuilder extends DillExtensionMemberBuilder {
 class DillExtensionStaticMethodBuilder extends DillExtensionMemberBuilder {
   final Procedure procedure;
 
-  DillExtensionStaticMethodBuilder(
-      this.procedure, ExtensionMemberDescriptor descriptor, Builder parent)
+  DillExtensionStaticMethodBuilder(this.procedure, super.descriptor,
+      super.libraryBuilder, super.declarationBuilder)
       : assert(descriptor.kind == ExtensionMemberKind.Method),
-        assert(descriptor.isStatic),
-        super(procedure, descriptor, parent);
+        assert(descriptor.isStatic);
 
   @override
   // Coverage-ignore(suite): Not run.
@@ -166,14 +161,10 @@ class DillExtensionInstanceMethodBuilder extends DillExtensionMemberBuilder {
 
   final Procedure _extensionTearOff;
 
-  DillExtensionInstanceMethodBuilder(
-      this.procedure,
-      ExtensionMemberDescriptor descriptor,
-      Builder parent,
-      this._extensionTearOff)
+  DillExtensionInstanceMethodBuilder(this.procedure, super.descriptor,
+      super.libraryBuilder, super.declarationBuilder, this._extensionTearOff)
       : assert(descriptor.kind == ExtensionMemberKind.Method),
-        assert(!descriptor.isStatic),
-        super(procedure, descriptor, parent);
+        assert(!descriptor.isStatic);
 
   @override
   // Coverage-ignore(suite): Not run.