[cfe] Remove LibraryBuilder.addBuilder

Remove LibraryBuilder.addBuilder to let the implementations in
SourceLibraryBuilder and DillLibraryBuilder to change independently.

Offset argument removed from DillLibraryBuilder.addMember and
'addX' members are in DillLibraryBuilder are made private.

Change-Id: If239ae441655d3d7f7484fd5e809cc015effd78c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/241005
Reviewed-by: Chloe Stefantsova <cstefantsova@google.com>
Commit-Queue: Johnni Winther <johnniwinther@google.com>

Author: johnniwinther

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

@@ -73,8 +73,6 @@ abstract class LibraryBuilder implements ModifierBuilder {
 
   NameIterator get nameIterator;
 
-  Builder? addBuilder(String? name, Builder declaration, int charOffset);
-
   void addExporter(LibraryBuilder exporter,
       List<CombinatorBuilder>? combinators, int charOffset);
 

pkg/front_end/lib/src/fasta/dill/dill_library_builder.dart

@@ -102,8 +102,8 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
     isBuiltAndMarked = true;
     if (isBuilt) return;
     isBuilt = true;
-    library.classes.forEach(addClass);
-    library.extensions.forEach(addExtension);
+    library.classes.forEach(_addClass);
+    library.extensions.forEach(_addExtension);
 
     Map<String, Map<Name, Procedure>> tearOffs = {};
     List<Procedure> nonTearOffs = [];
@@ -116,12 +116,12 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
         nonTearOffs.add(procedure);
       }
     }
-    nonTearOffs.forEach(addMember);
-    library.procedures.forEach(addMember);
+    nonTearOffs.forEach(_addMember);
+    library.procedures.forEach(_addMember);
     for (Typedef typedef in library.typedefs) {
       addTypedef(typedef, tearOffs[typedef.name]);
     }
-    library.fields.forEach(addMember);
+    library.fields.forEach(_addMember);
 
     if (isReadyToFinalizeExports) {
       finalizeExports();
@@ -153,27 +153,26 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
 
   @override
   void addSyntheticDeclarationOfDynamic() {
-    addBuilder("dynamic",
-        new DynamicTypeDeclarationBuilder(const DynamicType(), this, -1), -1);
+    _addBuilder("dynamic",
+        new DynamicTypeDeclarationBuilder(const DynamicType(), this, -1));
   }
 
   @override
   void addSyntheticDeclarationOfNever() {
-    addBuilder(
+    _addBuilder(
         "Never",
         new NeverTypeDeclarationBuilder(
-            const NeverType.nonNullable(), this, -1),
-        -1);
+            const NeverType.nonNullable(), this, -1));
   }
 
   @override
   void addSyntheticDeclarationOfNull() {
     // The name "Null" is declared by the class Null.
   }
 
-  void addClass(Class cls) {
+  void _addClass(Class cls) {
     DillClassBuilder classBuilder = new DillClassBuilder(cls, this);
-    addBuilder(cls.name, classBuilder, cls.fileOffset);
+    _addBuilder(cls.name, classBuilder);
     Map<String, Procedure> tearOffs = {};
     List<Procedure> nonTearOffs = [];
     for (Procedure procedure in cls.procedures) {
@@ -205,13 +204,13 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
     }
   }
 
-  void addExtension(Extension extension) {
+  void _addExtension(Extension extension) {
     DillExtensionBuilder extensionBuilder =
         new DillExtensionBuilder(extension, this);
-    addBuilder(extension.name, extensionBuilder, extension.fileOffset);
+    _addBuilder(extension.name, extensionBuilder);
   }
 
-  void addMember(Member member) {
+  void _addMember(Member member) {
     if (member.isExtensionMember) {
       return null;
     }
@@ -233,24 +232,20 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
           json != null ? new Map<String, String>.from(json) : null;
     } else {
       if (member is Field) {
-        addBuilder(name, new DillFieldBuilder(member, this), member.fileOffset);
+        _addBuilder(name, new DillFieldBuilder(member, this));
       } else if (member is Procedure) {
         switch (member.kind) {
           case ProcedureKind.Setter:
-            addBuilder(
-                name, new DillSetterBuilder(member, this), member.fileOffset);
+            _addBuilder(name, new DillSetterBuilder(member, this));
             break;
           case ProcedureKind.Getter:
-            addBuilder(
-                name, new DillGetterBuilder(member, this), member.fileOffset);
+            _addBuilder(name, new DillGetterBuilder(member, this));
             break;
           case ProcedureKind.Operator:
-            addBuilder(
-                name, new DillOperatorBuilder(member, this), member.fileOffset);
+            _addBuilder(name, new DillOperatorBuilder(member, this));
             break;
           case ProcedureKind.Method:
-            addBuilder(
-                name, new DillMethodBuilder(member, this), member.fileOffset);
+            _addBuilder(name, new DillMethodBuilder(member, this));
             break;
           case ProcedureKind.Factory:
             throw new UnsupportedError(
@@ -263,8 +258,7 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
     }
   }
 
-  @override
-  Builder? addBuilder(String? name, Builder declaration, int charOffset) {
+  Builder? _addBuilder(String? name, Builder declaration) {
     if (name == null || name.isEmpty) return null;
 
     bool isSetter = declaration.isSetter;
@@ -292,8 +286,8 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
     if (type is FunctionType && type.typedefType == null) {
       unhandled("null", "addTypedef", typedef.fileOffset, typedef.fileUri);
     }
-    addBuilder(typedef.name, new DillTypeAliasBuilder(typedef, tearOffs, this),
-        typedef.fileOffset);
+    _addBuilder(
+        typedef.name, new DillTypeAliasBuilder(typedef, tearOffs, this));
   }
 
   @override

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

@@ -62,7 +62,7 @@ class Import {
 
   Uri get fileUri => importer.fileUri;
 
-  void finalizeImports(LibraryBuilder importer) {
+  void finalizeImports(SourceLibraryBuilder importer) {
     if (nativeImportPath != null) return;
     void Function(String, Builder) add;
     if (prefixBuilder == null) {

pkg/front_end/lib/src/fasta/source/source_library_builder.dart

@@ -787,7 +787,6 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
     }
   }
 
-  @override
   Builder? addBuilder(String? name, Builder declaration, int charOffset,
       {Reference? getterReference, Reference? setterReference}) {
     // TODO(ahe): Set the parent correctly here. Could then change the