[cfe] Add SourceDeclarationBuilderBaseMixin

This shares some of SourceDeclarationBuilderMixin with SourceClassBuilder

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

Author: johnniwinther

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

@@ -24,6 +24,9 @@ abstract class BuiltinTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
       this.name, this.type, this.parent, this.fileOffset)
       : fileUri = parent.fileUri;
 
+  @override
+  int get typeParametersCount => 0;
+
   @override
   DartType buildAliasedType(
       LibraryBuilder library,

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

@@ -79,6 +79,7 @@ abstract class ClassBuilder implements DeclarationBuilder {
 }
 
 abstract class ClassBuilderImpl extends DeclarationBuilderImpl
+    with DeclarationBuilderMixin
     implements ClassBuilder {
   @override
   bool isNullClass = false;
@@ -98,33 +99,6 @@ abstract class ClassBuilderImpl extends DeclarationBuilderImpl
         !isNamedMixinApplication;
   }
 
-  @override
-  LookupResult? findStaticBuilder(String name, int fileOffset, Uri fileUri,
-      LibraryBuilder accessingLibrary) {
-    if (accessingLibrary.nameOriginBuilder !=
-            libraryBuilder.nameOriginBuilder &&
-        name.startsWith("_")) {
-      return null;
-    }
-    return nameSpace.lookupLocal(name,
-        fileUri: fileUri, fileOffset: fileOffset, staticOnly: true);
-  }
-
-  @override
-  NamedBuilder? lookupLocalMember(String name,
-      {bool setter = false, bool required = false}) {
-    LookupResult? result = nameSpace.lookupLocalMember(name);
-    NamedBuilder? builder = setter ? result?.setable : result?.getable;
-    if (required && builder == null) {
-      internalProblem(
-          templateInternalProblemNotFoundIn.withArguments(
-              name, fullNameForErrors),
-          -1,
-          null);
-    }
-    return builder;
-  }
-
   @override
   InterfaceType get thisType {
     return _thisType ??= new InterfaceType(cls, Nullability.nonNullable,

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

@@ -10,7 +10,7 @@ import 'package:kernel/src/unaliasing.dart';
 import '../base/lookup_result.dart';
 import '../base/messages.dart';
 import '../base/name_space.dart';
-import '../base/problems.dart' show internalProblem, unexpected, unhandled;
+import '../base/problems.dart' show unexpected, unhandled;
 import '../base/scope.dart';
 import '../base/uris.dart';
 import '../codes/cfe_codes.dart';

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

@@ -20,6 +20,9 @@ class InvalidTypeDeclarationBuilder extends TypeDeclarationBuilderImpl
   InvalidTypeDeclarationBuilder(this.name, this.message,
       {this.context, this.suppressMessage = true});
 
+  @override
+  int get typeParametersCount => 0;
+
   @override
   Builder? get parent => null;
 

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

@@ -69,9 +69,6 @@ abstract class TypeDeclarationBuilderImpl extends NamedBuilderImpl
   @override
   String get fullNameForErrors => name;
 
-  @override
-  int get typeParametersCount => 0;
-
   @override
   NamedBuilder get getable => this;
 

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

@@ -53,6 +53,9 @@ sealed class TypeParameterBuilder extends TypeDeclarationBuilderImpl
     return sb.toString();
   }
 
+  @override
+  int get typeParametersCount => 0;
+
   Variance get variance;
 
   void set variance(Variance value);

pkg/front_end/lib/src/kernel/kernel_helper.dart

@@ -327,23 +327,6 @@ class TypeDependency {
   }
 }
 
-/// Removes [FileUriExpression] nodes for annotations whose file URI is
-/// [annotatableFileUri], the file URI of the [annotatable].
-///
-/// This is an optimization to avoid unnecessary [FileUriConstantExpression]
-/// nodes in the generated AST.
-void adjustAnnotationFileUri(Annotatable annotatable, Uri annotatableFileUri) {
-  List<Expression> annotations = annotatable.annotations;
-  for (int i = 0; i < annotations.length; i++) {
-    Expression annotation = annotations[i];
-    if (annotation is FileUriExpression &&
-        annotation.fileUri == annotatableFileUri) {
-      // Coverage-ignore-block(suite): Not run.
-      annotations[i] = annotation.expression..parent = annotatable;
-    }
-  }
-}
-
 // Coverage-ignore(suite): Not run.
 /// Copies properties, function parameters and body from the [augmentation]
 /// procedure to its [origin].
@@ -357,6 +340,4 @@ void finishProcedureAugmentation(Procedure origin, Procedure augmentation) {
   origin.isExternal = augmentation.isExternal;
   origin.function = augmentation.function;
   origin.function.parent = origin;
-
-  adjustAnnotationFileUri(origin, origin.fileUri);
 }

pkg/front_end/lib/src/source/source_builder_mixins.dart

@@ -17,19 +17,117 @@ import '../builder/factory_builder.dart';
 import '../builder/library_builder.dart';
 import '../builder/type_builder.dart';
 import '../kernel/type_algorithms.dart';
+import 'source_class_builder.dart';
 import 'source_declaration_builder.dart';
 import 'source_library_builder.dart';
 import 'source_loader.dart';
 import 'source_member_builder.dart';
 import 'source_type_parameter_builder.dart';
 
-mixin SourceDeclarationBuilderMixin
+mixin SourceDeclarationBuilderBaseMixin
     implements DeclarationBuilderMixin, SourceDeclarationBuilder {
   @override
-  SourceLibraryBuilder get libraryBuilder;
+  List<SourceNominalParameterBuilder>? get typeParameters;
 
   @override
-  List<SourceNominalParameterBuilder>? get typeParameters;
+  int get typeParametersCount => typeParameters?.length ?? 0;
+
+  @override
+  int computeDefaultTypes(ComputeDefaultTypeContext context) {
+    bool hasErrors = context.reportNonSimplicityIssues(this, typeParameters);
+    int count = context.computeDefaultTypesForVariables(typeParameters,
+        inErrorRecovery: hasErrors);
+
+    Iterator<SourceMemberBuilder> constructorIterator =
+        filteredConstructorsIterator<SourceMemberBuilder>(
+            includeDuplicates: false);
+    while (constructorIterator.moveNext()) {
+      count += constructorIterator.current
+          .computeDefaultTypes(context, inErrorRecovery: hasErrors);
+    }
+
+    Iterator<SourceMemberBuilder> memberIterator =
+        filteredMembersIterator(includeDuplicates: false);
+    while (memberIterator.moveNext()) {
+      count += memberIterator.current
+          .computeDefaultTypes(context, inErrorRecovery: hasErrors);
+    }
+    return count;
+  }
+
+  void checkTypesInOutline(TypeEnvironment typeEnvironment) {
+    Iterator<SourceMemberBuilder> memberIterator =
+        filteredMembersIterator(includeDuplicates: false);
+
+    SourceDeclarationBuilder enclosingDeclarationBuilder = this;
+    SourceClassBuilder? enclosingClassBuilder =
+        enclosingDeclarationBuilder is SourceClassBuilder
+            ? enclosingDeclarationBuilder
+            : null;
+    while (memberIterator.moveNext()) {
+      SourceMemberBuilder builder = memberIterator.current;
+      if (enclosingClassBuilder != null) {
+        builder.checkVariance(enclosingClassBuilder, typeEnvironment);
+      }
+      builder.checkTypes(libraryBuilder, nameSpace, typeEnvironment);
+    }
+
+    Iterator<SourceMemberBuilder> constructorIterator =
+        filteredConstructorsIterator(includeDuplicates: false);
+    while (constructorIterator.moveNext()) {
+      constructorIterator.current
+          .checkTypes(libraryBuilder, nameSpace, typeEnvironment);
+    }
+  }
+
+  @override
+  List<DartType> buildAliasedTypeArguments(LibraryBuilder library,
+      List<TypeBuilder>? arguments, ClassHierarchyBase? hierarchy) {
+    if (arguments == null && typeParameters == null) {
+      return <DartType>[];
+    }
+
+    if (arguments == null && typeParameters != null) {
+      List<DartType> result =
+          new List<DartType>.generate(typeParameters!.length, (int i) {
+        if (typeParameters![i].defaultType == null) {
+          throw 'here';
+        }
+        return typeParameters![i].defaultType!.buildAliased(
+            library, TypeUse.defaultTypeAsTypeArgument, hierarchy);
+      }, growable: true);
+      return result;
+    }
+
+    if (arguments != null && arguments.length != typeParametersCount) {
+      // Coverage-ignore-block(suite): Not run.
+      assert(libraryBuilder.loader.assertProblemReportedElsewhere(
+          "$runtimeType.buildAliasedTypeArguments: "
+          "the numbers of type parameters and type arguments don't match.",
+          expectedPhase: CompilationPhaseForProblemReporting.outline));
+      return unhandled(
+          templateTypeArgumentMismatch
+              .withArguments(typeParametersCount)
+              .problemMessage,
+          "buildTypeArguments",
+          -1,
+          null);
+    }
+
+    assert(arguments!.length == typeParametersCount);
+    List<DartType> result =
+        new List<DartType>.generate(arguments!.length, (int i) {
+      return arguments[i]
+          .buildAliased(library, TypeUse.typeArgument, hierarchy);
+    }, growable: true);
+    return result;
+  }
+}
+
+mixin SourceDeclarationBuilderMixin
+    implements DeclarationBuilderMixin, SourceDeclarationBuilder {
+  @override
+  SourceLibraryBuilder get libraryBuilder;
 
   @override
   Uri get fileUri;
@@ -117,45 +215,6 @@ mixin SourceDeclarationBuilderMixin
     return count;
   }
 
-  @override
-  int computeDefaultTypes(ComputeDefaultTypeContext context) {
-    bool hasErrors = context.reportNonSimplicityIssues(this, typeParameters);
-    int count = context.computeDefaultTypesForVariables(typeParameters,
-        inErrorRecovery: hasErrors);
-
-    Iterator<SourceMemberBuilder> constructorIterator =
-        filteredConstructorsIterator<SourceMemberBuilder>(
-            includeDuplicates: false);
-    while (constructorIterator.moveNext()) {
-      count += constructorIterator.current
-          .computeDefaultTypes(context, inErrorRecovery: hasErrors);
-    }
-
-    Iterator<SourceMemberBuilder> memberIterator =
-        filteredMembersIterator(includeDuplicates: false);
-    while (memberIterator.moveNext()) {
-      count += memberIterator.current
-          .computeDefaultTypes(context, inErrorRecovery: hasErrors);
-    }
-    return count;
-  }
-
-  void checkTypesInOutline(TypeEnvironment typeEnvironment) {
-    Iterator<SourceMemberBuilder> memberIterator =
-        filteredMembersIterator(includeDuplicates: false);
-    while (memberIterator.moveNext()) {
-      memberIterator.current
-          .checkTypes(libraryBuilder, nameSpace, typeEnvironment);
-    }
-
-    Iterator<SourceMemberBuilder> constructorIterator =
-        filteredConstructorsIterator(includeDuplicates: false);
-    while (constructorIterator.moveNext()) {
-      constructorIterator.current
-          .checkTypes(libraryBuilder, nameSpace, typeEnvironment);
-    }
-  }
-
   void _buildMember(SourceMemberBuilder memberBuilder, Member member,
       Member? tearOff, BuiltMemberKind memberKind,
       {required bool addMembersToLibrary}) {
@@ -202,50 +261,4 @@ mixin SourceDeclarationBuilderMixin
       BuiltMemberKind memberKind,
       Reference memberReference,
       Reference? tearOffReference);
-
-  @override
-  List<DartType> buildAliasedTypeArguments(LibraryBuilder library,
-      List<TypeBuilder>? arguments, ClassHierarchyBase? hierarchy) {
-    if (arguments == null && typeParameters == null) {
-      return <DartType>[];
-    }
-
-    if (arguments == null && typeParameters != null) {
-      List<DartType> result =
-          new List<DartType>.generate(typeParameters!.length, (int i) {
-        if (typeParameters![i].defaultType == null) {
-          throw 'here';
-        }
-        return typeParameters![i].defaultType!.buildAliased(
-            library, TypeUse.defaultTypeAsTypeArgument, hierarchy);
-      }, growable: true);
-      return result;
-    }
-
-    if (arguments != null && arguments.length != typeParametersCount) {
-      // Coverage-ignore-block(suite): Not run.
-      assert(libraryBuilder.loader.assertProblemReportedElsewhere(
-          "SourceDeclarationBuilderMixin.buildAliasedTypeArguments: "
-          "the numbers of type parameters and type arguments don't match.",
-          expectedPhase: CompilationPhaseForProblemReporting.outline));
-      return unhandled(
-          templateTypeArgumentMismatch
-              .withArguments(typeParametersCount)
-              .problemMessage,
-          "buildTypeArguments",
-          -1,
-          null);
-    }
-
-    assert(arguments!.length == typeParametersCount);
-    List<DartType> result =
-        new List<DartType>.generate(arguments!.length, (int i) {
-      return arguments[i]
-          .buildAliased(library, TypeUse.typeArgument, hierarchy);
-    }, growable: true);
-    return result;
-  }
-
-  @override
-  int get typeParametersCount => typeParameters?.length ?? 0;
 }