[cfe] Cleanup constructor and factory builder properties

This removes properties from the builders that belong to the declarations.

Change-Id: If576f6b62b64bf57b1e629eb6caf0ab4db522980
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/435125
Reviewed-by: Chloe Stefantsova <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/fragment/constructor/body_builder_context.dart

@@ -73,7 +73,7 @@ class ConstructorBodyBuilderContext extends BodyBuilderContext {
   @override
   // Coverage-ignore(suite): Not run.
   bool get isNativeMethod {
-    return _builder.isNative;
+    return _declaration.isNative;
   }
 
   @override

pkg/front_end/lib/src/fragment/constructor/declaration.dart

@@ -774,6 +774,10 @@ class RegularConstructorDeclaration
   @override
   String? get _nativeMethodName => _fragment.nativeMethodName;
 
+  @override
+  // Coverage-ignore(suite): Not run.
+  bool get isNative => _fragment.nativeMethodName != null;
+
   @override
   LookupScope get _typeParameterScope => _fragment.typeParameterScope;
 
@@ -951,6 +955,10 @@ class DefaultEnumConstructorDeclaration
     throw new UnsupportedError("$runtimeType.becomeNative()");
   }
 
+  @override
+  // Coverage-ignore(suite): Not run.
+  bool get isNative => false;
+
   @override
   LookupScope get _typeParameterScope => _lookupScope;
 
@@ -1054,6 +1062,10 @@ class PrimaryConstructorDeclaration
   // Coverage-ignore(suite): Not run.
   String? get _nativeMethodName => null;
 
+  @override
+  // Coverage-ignore(suite): Not run.
+  bool get isNative => false;
+
   @override
   void createEncoding({
     required ProblemReporting problemReporting,
@@ -1259,6 +1271,8 @@ abstract class ConstructorFragmentDeclaration {
   bool get isConst;
 
   bool get isExternal;
+
+  bool get isNative;
 }
 
 mixin _SyntheticConstructorDeclarationMixin implements ConstructorDeclaration {
@@ -1280,7 +1294,6 @@ mixin _SyntheticConstructorDeclarationMixin implements ConstructorDeclaration {
       _constructor.function.namedParameters.isNotEmpty;
 
   @override
-  // Coverage-ignore(suite): Not run.
   bool get isExternal => false;
 
   @override

pkg/front_end/lib/src/fragment/factory/encoding.dart

@@ -153,7 +153,7 @@ class FactoryEncoding implements InferredTypeListener {
     // patch a const constructor with a non-const patch. Remove this and enforce
     // equal constness on origin and patch.
     _procedure.isConst = isConst;
-    _procedure.isStatic = _fragment.modifiers.isStatic;
+    _procedure.isStatic = true;
 
     if (_redirectionTarget != null) {
       if (_redirectionTarget.typeArguments != null) {

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

@@ -1094,8 +1094,7 @@ class KernelTarget {
         constructorReferences: constructorReferences,
         nameScheme: nameScheme,
         introductory: declaration,
-        isConst: isConst,
-        isExternal: false);
+        isConst: isConst);
 
     loader.registerConstructorToBeInferred(
         new InferableConstructor(constructor, constructorBuilder));
@@ -1202,7 +1201,6 @@ class KernelTarget {
         constructorReferences: constructorReferences,
         nameScheme: nameScheme,
         introductory: declaration,
-        isExternal: false,
         isConst: false);
   }
 

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

@@ -1389,7 +1389,7 @@ class BuilderFactoryImpl implements BuilderFactory, BuilderFactoryResult {
       startOffset: startOffset,
       formalsOffset: formalsOffset,
       endOffset: endOffset,
-      modifiers: modifiers | Modifiers.Static,
+      modifiers: modifiers,
       metadata: metadata,
       typeParameterNameSpace: typeParameterNameSpace,
       enclosingScope: _declarationFragments.current.bodyScope,

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

@@ -907,9 +907,9 @@ class SourceClassBuilder extends ClassBuilderImpl
         if (constructor is SourceConstructorBuilder) {
           // Report an error if a mixin class has a constructor with parameters,
           // is external, or is a redirecting constructor.
-          if (constructor.isRedirecting ||
+          if (constructor.isEffectivelyRedirecting ||
               constructor.hasParameters ||
-              constructor.isExternal) {
+              constructor.isEffectivelyExternal) {
             libraryBuilder.addProblem(
                 templateIllegalMixinDueToConstructors
                     .withArguments(fullNameForErrors),

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

@@ -115,8 +115,6 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
   late final Substitution _fieldTypeSubstitution =
       _introductory.computeFieldTypeSubstitution(declarationBuilder);
 
-  final String? nativeMethodName;
-
   SuperInitializer? superInitializer;
 
   RedirectingInitializer? redirectingInitializer;
@@ -130,8 +128,6 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
   @override
   final bool isConst;
 
-  final bool isExternal;
-
   final ConstructorReferences _constructorReferences;
   final NameScheme _nameScheme;
 
@@ -141,13 +137,11 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
     required this.declarationBuilder,
     required this.fileOffset,
     required this.fileUri,
-    this.nativeMethodName,
     required ConstructorReferences constructorReferences,
     required NameScheme nameScheme,
     required ConstructorDeclaration introductory,
     List<ConstructorDeclaration> augmentations = const [],
     required this.isConst,
-    required this.isExternal,
   })  : _constructorReferences = constructorReferences,
         _nameScheme = nameScheme,
         _introductory = introductory,
@@ -206,7 +200,7 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
   /// An augmented constructor is considered external if all of the origin
   /// and augmentation constructors are external.
   bool get isEffectivelyExternal {
-    bool isExternal = this.isExternal;
+    bool isExternal = _introductory.isExternal;
     if (isExternal) {
       for (ConstructorDeclaration augmentation in _augmentations) {
         isExternal &= augmentation.isExternal;
@@ -236,20 +230,10 @@ class SourceConstructorBuilder extends SourceMemberBuilderImpl
   // Coverage-ignore(suite): Not run.
   bool get isFinal => false;
 
-  // Coverage-ignore(suite): Not run.
-  bool get isNative => nativeMethodName != null;
-
   @override
   // Coverage-ignore(suite): Not run.
   bool get isProperty => false;
 
-  /// Returns `true` if this constructor is an redirecting generative
-  /// constructor.
-  ///
-  /// It is considered redirecting if it has at least one redirecting
-  /// initializer.
-  bool get isRedirecting => _lastDeclaration.isRedirecting;
-
   @override
   bool get isStatic => false;
 

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

@@ -345,8 +345,7 @@ class SourceEnumBuilder extends SourceClassBuilder {
               constructorReferences: constructorReferences,
               nameScheme: nameScheme,
               introductory: constructorDeclaration,
-              isConst: true,
-              isExternal: false);
+              isConst: true);
       constructorDeclaration.createEncoding(
           problemReporting: libraryBuilder,
           loader: libraryBuilder.loader,

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

@@ -8,7 +8,6 @@ import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/reference_from_index.dart';
 import 'package:kernel/type_environment.dart';
 
-import '../base/modifiers.dart';
 import '../base/name_space.dart';
 import '../builder/builder.dart';
 import '../builder/constructor_reference_builder.dart';
@@ -28,8 +27,6 @@ import 'source_member_builder.dart';
 
 class SourceFactoryBuilder extends SourceMemberBuilderImpl
     implements FactoryBuilder {
-  final Modifiers modifiers;
-
   @override
   final String name;
 
@@ -62,17 +59,20 @@ class SourceFactoryBuilder extends SourceMemberBuilderImpl
 
   late final List<FactoryDeclaration> _augmentedDeclarations;
 
+  @override
+  final bool isConst;
+
   SourceFactoryBuilder(
-      {required this.modifiers,
-      required this.name,
+      {required this.name,
       required this.libraryBuilder,
       required this.declarationBuilder,
       required this.fileUri,
       required this.fileOffset,
       required FactoryReferences factoryReferences,
       required NameScheme nameScheme,
       required FactoryDeclaration introductory,
-      required List<FactoryDeclaration> augmentations})
+      required List<FactoryDeclaration> augmentations,
+      required this.isConst})
       : _nameScheme = nameScheme,
         _factoryReferences = factoryReferences,
         _memberName = nameScheme.getDeclaredName(name),
@@ -95,10 +95,7 @@ class SourceFactoryBuilder extends SourceMemberBuilderImpl
       _lastDeclaration.redirectionTarget;
 
   @override
-  bool get isConst => modifiers.isConst;
-
-  @override
-  bool get isStatic => modifiers.isStatic;
+  bool get isStatic => true;
 
   @override
   // Coverage-ignore(suite): Not run.

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

@@ -2755,7 +2755,6 @@ _AddBuilder _createConstructorBuilder(
     required ContainerName? containerName}) {
   String name = fragment.name;
   bool isConst = fragment.modifiers.isConst;
-  bool isExternal = fragment.modifiers.isExternal;
 
   ConstructorDeclaration constructorDeclaration =
       new RegularConstructorDeclaration(fragment);
@@ -2768,10 +2767,6 @@ _AddBuilder _createConstructorBuilder(
 
       augmentationDeclarations
           .add(new RegularConstructorDeclaration(augmentation));
-
-      if (!augmentation.modifiers.isExternal) {
-        isExternal = false;
-      }
     }
     augmentations.clear();
   }
@@ -2789,9 +2784,7 @@ _AddBuilder _createConstructorBuilder(
       containerType: containerType,
       indexedContainer: indexedContainer,
       containerName: containerName,
-      nativeMethodName: fragment.nativeMethodName,
       isConst: isConst,
-      isExternal: isExternal,
       inPatch: fragment.enclosingDeclaration.isPatch);
 }
 
@@ -2809,9 +2802,7 @@ _AddBuilder _createConstructorBuilderFromDeclarations(
     required ContainerType containerType,
     required IndexedContainer? indexedContainer,
     required ContainerName? containerName,
-    required String? nativeMethodName,
     required bool isConst,
-    required bool isExternal,
     required bool inPatch}) {
   NameScheme nameScheme = new NameScheme(
       isInstanceMember: false,
@@ -2839,11 +2830,9 @@ _AddBuilder _createConstructorBuilderFromDeclarations(
       fileOffset: uriOffset.fileOffset,
       constructorReferences: constructorReferences,
       nameScheme: nameScheme,
-      nativeMethodName: nativeMethodName,
       introductory: constructorDeclaration,
       augmentations: augmentationDeclarations,
-      isConst: isConst,
-      isExternal: isExternal);
+      isConst: isConst);
   constructorReferences.registerReference(loader, constructorBuilder);
 
   constructorDeclaration.createEncoding(
@@ -2894,9 +2883,7 @@ _AddBuilder _createPrimaryConstructorBuilder(
       containerType: containerType,
       indexedContainer: indexedContainer,
       containerName: containerName,
-      nativeMethodName: null,
       isConst: fragment.modifiers.isConst,
-      isExternal: fragment.modifiers.isExternal,
       inPatch: fragment.enclosingDeclaration.isPatch);
 }
 
@@ -2912,7 +2899,7 @@ _AddBuilder _createFactoryBuilder(
     required IndexedContainer? indexedContainer,
     required ContainerName? containerName}) {
   String name = fragment.name;
-  Modifiers modifiers = fragment.modifiers;
+  bool isConst = fragment.modifiers.isConst;
 
   FactoryEncodingStrategy encodingStrategy =
       new FactoryEncodingStrategy(declarationBuilder!);
@@ -2945,16 +2932,11 @@ _AddBuilder _createFactoryBuilder(
       augmentationDeclarations.add(new FactoryDeclarationImpl(augmentation));
 
       isRedirectingFactory |= augmentation.redirectionTarget != null;
-
-      if (!augmentation.modifiers.isExternal) {
-        modifiers -= Modifiers.External;
-      }
     }
     augmentations.clear();
   }
 
   SourceFactoryBuilder factoryBuilder = new SourceFactoryBuilder(
-      modifiers: modifiers,
       name: name,
       libraryBuilder: enclosingLibraryBuilder,
       declarationBuilder: declarationBuilder,
@@ -2963,7 +2945,8 @@ _AddBuilder _createFactoryBuilder(
       factoryReferences: factoryReferences,
       nameScheme: nameScheme,
       introductory: introductoryDeclaration,
-      augmentations: augmentationDeclarations);
+      augmentations: augmentationDeclarations,
+      isConst: isConst);
   if (isRedirectingFactory) {
     (enclosingLibraryBuilder.redirectingFactoryBuilders ??= [])
         .add(factoryBuilder);