[cfe] Add PrimaryConstructoFieldFragment

This creates a PrimaryConstructorFieldFragment instead of a FieldFragment for primary constructor fields (currently only occurring in extension types).

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

Author: johnniwinther

pkg/front_end/lib/src/fragment/extension_type.dart

@@ -18,7 +18,7 @@ class ExtensionTypeFragment extends DeclarationFragmentImpl
   late final int startOffset;
   late final int endOffset;
 
-  final List<FieldFragment> primaryConstructorFields = [];
+  final List<PrimaryConstructorFieldFragment> primaryConstructorFields = [];
 
   SourceExtensionTypeDeclarationBuilder? _builder;
 
@@ -54,7 +54,7 @@ class ExtensionTypeFragment extends DeclarationFragmentImpl
       modifiers.isAugment;
 
   @override
-  void addPrimaryConstructorField(FieldFragment fragment) {
+  void addPrimaryConstructorField(PrimaryConstructorFieldFragment fragment) {
     primaryConstructorFields.add(fragment);
   }
 

pkg/front_end/lib/src/fragment/field.dart

@@ -23,9 +23,6 @@ class FieldFragment implements Fragment {
 
   final bool isTopLevel;
   final Modifiers modifiers;
-  // TODO(johnniwinther): Create separate fragment for primary constructor
-  // fields.
-  final bool isPrimaryConstructorField;
 
   final LookupScope enclosingScope;
 
@@ -46,7 +43,6 @@ class FieldFragment implements Fragment {
     required this.type,
     required this.isTopLevel,
     required this.modifiers,
-    required this.isPrimaryConstructorField,
     required this.enclosingScope,
     required this.enclosingDeclaration,
     required this.enclosingCompilationUnit,

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

@@ -5,17 +5,36 @@
 part of '../fragment.dart';
 
 class FieldFragmentBodyBuilderContext extends BodyBuilderContext {
+  final SourcePropertyBuilder _builder;
   final FieldFragmentDeclaration _declaration;
-  final FieldFragment _fragment;
 
-  FieldFragmentBodyBuilderContext(
-      this._declaration,
-      this._fragment,
-      SourceLibraryBuilder libraryBuilder,
-      DeclarationBuilder? declarationBuilder,
-      {required bool isDeclarationInstanceMember})
-      : super(libraryBuilder, declarationBuilder,
-            isDeclarationInstanceMember: isDeclarationInstanceMember);
+  @override
+  final bool isLateField;
+
+  @override
+  final bool isAbstractField;
+
+  @override
+  final bool isExternalField;
+
+  final int _nameOffset;
+
+  final int _nameLength;
+
+  final bool _isConst;
+
+  FieldFragmentBodyBuilderContext(this._builder, this._declaration,
+      {required this.isLateField,
+      required this.isAbstractField,
+      required this.isExternalField,
+      required int nameOffset,
+      required int nameLength,
+      required bool isConst})
+      : this._nameOffset = nameOffset,
+        this._nameLength = nameLength,
+        this._isConst = isConst,
+        super(_builder.libraryBuilder, _builder.declarationBuilder,
+            isDeclarationInstanceMember: _builder.isDeclarationInstanceMember);
 
   @override
   // Coverage-ignore(suite): Not run.
@@ -25,26 +44,17 @@ class FieldFragmentBodyBuilderContext extends BodyBuilderContext {
     return parent;
   }
 
-  @override
-  bool get isLateField => _fragment.modifiers.isLate;
-
-  @override
-  bool get isAbstractField => _fragment.modifiers.isAbstract;
-
-  @override
-  bool get isExternalField => _fragment.modifiers.isExternal;
-
   @override
   // Coverage-ignore(suite): Not run.
-  int get memberNameOffset => _fragment.nameOffset;
+  int get memberNameOffset => _nameOffset;
 
   @override
   // Coverage-ignore(suite): Not run.
-  int get memberNameLength => _fragment.name.length;
+  int get memberNameLength => _nameLength;
 
   @override
   InstanceTypeParameterAccessState get instanceTypeParameterAccessState {
-    if (_fragment.builder.isExtensionMember && !isExternalField) {
+    if (_builder.isExtensionMember && !isExternalField) {
       return InstanceTypeParameterAccessState.Invalid;
     } else {
       return super.instanceTypeParameterAccessState;
@@ -59,15 +69,15 @@ class FieldFragmentBodyBuilderContext extends BodyBuilderContext {
   @override
   // Coverage-ignore(suite): Not run.
   AugmentSuperTarget? get augmentSuperTarget {
-    if (_fragment.builder.isAugmentation) {
-      return _fragment.builder.augmentSuperTarget;
+    if (_builder.isAugmentation) {
+      return _builder.augmentSuperTarget;
     }
     return null;
   }
 
   @override
   ConstantContext get constantContext {
-    return _fragment.modifiers.isConst
+    return _isConst
         ? ConstantContext.inferred
         : !_declaration.isStatic && declarationDeclaresConstConstructor
             ? ConstantContext.required

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

@@ -128,7 +128,7 @@ abstract class FieldDeclaration {
   shared.Expression? get initializerExpression;
 }
 
-class FieldDeclarationImpl
+class RegularFieldDeclaration
     with FieldDeclarationMixin
     implements
         FieldDeclaration,
@@ -149,7 +149,7 @@ class FieldDeclarationImpl
   /// building them twice as part of the non-outline build.
   bool hasBodyBeenBuilt = false;
 
-  FieldDeclarationImpl(this._fragment) {
+  RegularFieldDeclaration(this._fragment) {
     _fragment.declaration = this;
   }
 
@@ -194,8 +194,7 @@ class FieldDeclarationImpl
 
   @override
   bool get isExtensionTypeDeclaredInstanceField =>
-      builder.isExtensionTypeInstanceMember &&
-      !_fragment.isPrimaryConstructorField;
+      builder.isExtensionTypeInstanceMember;
 
   @override
   bool get isFinal => _fragment.modifiers.isFinal;
@@ -404,9 +403,13 @@ class FieldDeclarationImpl
 
   @override
   BodyBuilderContext createBodyBuilderContext() {
-    return new FieldFragmentBodyBuilderContext(
-        this, _fragment, builder.libraryBuilder, builder.declarationBuilder,
-        isDeclarationInstanceMember: builder.isDeclarationInstanceMember);
+    return new FieldFragmentBodyBuilderContext(builder, this,
+        isLateField: _fragment.modifiers.isLate,
+        isAbstractField: _fragment.modifiers.isAbstract,
+        isExternalField: _fragment.modifiers.isExternal,
+        nameOffset: _fragment.nameOffset,
+        nameLength: _fragment.name.length,
+        isConst: _fragment.modifiers.isConst);
   }
 
   void createEncoding(SourcePropertyBuilder builder) {
@@ -430,20 +433,16 @@ class FieldDeclarationImpl
           isAbstract: isAbstract,
           isExternal: isExternal);
     } else if (isExtensionTypeMember && isInstanceMember) {
-      if (_fragment.isPrimaryConstructorField) {
-        _encoding = new RepresentationFieldEncoding(_fragment);
-      } else {
-        // Field on a extension type. Encode as abstract.
-        // TODO(johnniwinther): Should we have an erroneous flag on such
-        // members?
-        _encoding = new AbstractOrExternalFieldEncoding(_fragment,
-            isExtensionInstanceMember: isExtensionMember && isInstanceMember,
-            isExtensionTypeInstanceMember:
-                isExtensionTypeMember && isInstanceMember,
-            isAbstract: true,
-            isExternal: false,
-            isForcedExtension: true);
-      }
+      // Field on a extension type. Encode as abstract.
+      // TODO(johnniwinther): Should we have an erroneous flag on such
+      // members?
+      _encoding = new AbstractOrExternalFieldEncoding(_fragment,
+          isExtensionInstanceMember: isExtensionMember && isInstanceMember,
+          isExtensionTypeInstanceMember:
+              isExtensionTypeMember && isInstanceMember,
+          isAbstract: true,
+          isExternal: false,
+          isForcedExtension: true);
     } else if (isLate &&
         libraryBuilder.loader.target.backendTarget.isLateFieldLoweringEnabled(
             hasInitializer: hasInitializer,

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

@@ -1167,7 +1167,7 @@ class AbstractOrExternalFieldEncoding implements FieldEncoding {
 
 /// The encoding of an extension type declaration representation field.
 class RepresentationFieldEncoding implements FieldEncoding {
-  final FieldFragment _fragment;
+  final PrimaryConstructorFieldFragment _fragment;
 
   late Procedure _getter;
   DartType? _type;
@@ -1219,12 +1219,12 @@ class RepresentationFieldEncoding implements FieldEncoding {
         fileUri: _fragment.fileUri, reference: references.fieldGetterReference)
       ..stubKind = ProcedureStubKind.RepresentationField
       ..fileOffset = _fragment.nameOffset
-      ..fileEndOffset = _fragment.endOffset;
+      ..fileEndOffset = _fragment.nameOffset;
     nameScheme
         .getFieldMemberName(FieldNameType.RepresentationField, _fragment.name,
             isSynthesized: true)
         .attachMember(_getter);
-    _getter..isConst = _fragment.modifiers.isConst;
+    _getter..isConst = false;
     _getter
       ..isStatic = false
       ..isExtensionMember = false

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

@@ -56,8 +56,10 @@ import '../source/source_property_builder.dart';
 import '../source/source_type_alias_builder.dart';
 import '../source/source_type_parameter_builder.dart';
 import '../source/type_parameter_scope_builder.dart';
+import '../type_inference/inference_helper.dart';
 import '../type_inference/inference_results.dart';
 import '../type_inference/type_inference_engine.dart';
+import '../type_inference/type_inferrer.dart';
 import '../type_inference/type_schema.dart';
 import 'constructor/declaration.dart';
 import 'factory/declaration.dart';
@@ -86,6 +88,7 @@ part 'method.dart';
 part 'mixin.dart';
 part 'named_mixin_application.dart';
 part 'primary_constructor.dart';
+part 'primary_constructor_field.dart';
 part 'setter.dart';
 part 'type_parameter.dart';
 part 'typedef.dart';