[cfe] Add introductory TypedefFragment to SourceTypeAliasBuilder

This is a step towards creating builders through a set of fragments.

Change-Id: I9cc79234ac10163b91b03912869fb5aa23d790c7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/388820
Reviewed-by: Jens Johansen <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/base/incremental_compiler.dart

@@ -666,7 +666,6 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
       }
     }
     nextGoodKernelTarget.loader.buildersCreatedWithReferences.clear();
-    nextGoodKernelTarget.loader.fragmentsCreatedWithReferences.clear();
     nextGoodKernelTarget.loader.hierarchyBuilder.clear();
     nextGoodKernelTarget.loader.membersBuilder.clear();
     nextGoodKernelTarget.loader.referenceFromIndex = null;

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

@@ -9,8 +9,14 @@ abstract class TypeAliasBuilder implements TypeDeclarationBuilder {
   TypeBuilder get type;
 
   /// The [Typedef] built by this builder.
+  ///
+  /// For a typedef built from source, this is only available after AST nodes
+  /// have been built in [SourceLoader.buildOutlineNodes].
   Typedef get typedef;
 
+  /// Reference for the typedef built by this builder.
+  Reference get reference;
+
   DartType? thisType;
 
   String get debugName;

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

@@ -24,7 +24,6 @@ import '../builder/name_iterator.dart';
 import '../builder/never_type_declaration_builder.dart';
 import '../codes/cfe_codes.dart'
     show LocatedMessage, Message, Severity, noLength, templateUnspecified;
-import '../fragment/fragment.dart';
 import '../kernel/constructor_tearoff_lowering.dart';
 import '../kernel/utils.dart';
 import 'dill_class_builder.dart' show DillClassBuilder;
@@ -400,14 +399,9 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
 
     Map<Reference, Builder>? sourceBuildersMap =
         loader.currentSourceLoader?.buildersCreatedWithReferences;
-    Map<Reference, Fragment>? fragmentMap =
-        loader.currentSourceLoader?.fragmentsCreatedWithReferences;
     for (Reference reference in library.additionalExports) {
       NamedNode node = reference.node as NamedNode;
-      Builder? declaration = sourceBuildersMap?[reference] ??
-          fragmentMap?[reference]
-              // Coverage-ignore(suite): Not run.
-              ?.builder;
+      Builder? declaration = sourceBuildersMap?[reference];
       String name;
       if (declaration != null) {
         // Coverage-ignore-block(suite): Not run.
@@ -476,7 +470,7 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
       assert(
           (declaration is ClassBuilder && node == declaration.cls) ||
               (declaration is TypeAliasBuilder &&
-                  node == declaration.typedef) ||
+                  reference == declaration.reference) ||
               (declaration is MemberBuilder && node == declaration.member) ||
               (declaration is ExtensionBuilder &&
                   node == declaration.extension) ||

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

@@ -29,6 +29,9 @@ class DillTypeAliasBuilder extends TypeAliasBuilderImpl {
   DillTypeAliasBuilder(this.typedef, this.tearOffs, DillLibraryBuilder parent)
       : super(typedef.name, parent, typedef.fileUri, typedef.fileOffset);
 
+  @override
+  Reference get reference => typedef.reference;
+
   @override
   List<NominalVariableBuilder>? get typeVariables {
     if (_typeVariables == null && typedef.typeParameters.isNotEmpty) {

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

@@ -761,7 +761,7 @@ class SourceLibraryBuilder extends LibraryBuilderImpl {
             case ClassBuilder():
               library.additionalExports.add(builder.cls.reference);
             case TypeAliasBuilder():
-              library.additionalExports.add(builder.typedef.reference);
+              library.additionalExports.add(builder.reference);
             case ExtensionBuilder():
               library.additionalExports.add(builder.extension.reference);
             case ExtensionTypeDeclarationBuilder():

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

@@ -62,7 +62,6 @@ import '../codes/cfe_codes.dart';
 import '../codes/denylisted_classes.dart'
     show denylistedCoreClasses, denylistedTypedDataClasses;
 import '../dill/dill_library_builder.dart';
-import '../fragment/fragment.dart';
 import '../kernel/benchmarker.dart' show BenchmarkSubdivides;
 import '../kernel/body_builder.dart' show BodyBuilder;
 import '../kernel/body_builder_context.dart';
@@ -126,8 +125,6 @@ class SourceLoader extends Loader {
   /// exports in dill builders.
   Map<Reference, Builder> buildersCreatedWithReferences = {};
 
-  Map<Reference, Fragment> fragmentsCreatedWithReferences = {};
-
   /// Used when checking whether a return type of an async function is valid.
   ///
   /// The said return type is valid if it's a subtype of [futureOfBottom].

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

@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library fasta.source_type_alias_builder;
-
 import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart';
 
@@ -21,6 +19,7 @@ import '../builder/record_type_builder.dart';
 import '../builder/type_builder.dart';
 import '../codes/cfe_codes.dart'
     show templateCyclicTypedef, templateTypeArgumentMismatch;
+import '../fragment/fragment.dart';
 import '../kernel/body_builder_context.dart';
 import '../kernel/constructor_tearoff_lowering.dart';
 import '../kernel/expression_generator_helper.dart';
@@ -29,47 +28,55 @@ import 'source_library_builder.dart' show SourceLibraryBuilder;
 import 'source_loader.dart';
 
 class SourceTypeAliasBuilder extends TypeAliasBuilderImpl {
-  final List<MetadataBuilder>? metadata;
-
-  @override
-  TypeBuilder type;
+  late TypeBuilder _type;
 
-  final List<NominalVariableBuilder>? _typeVariables;
+  final Reference _reference;
 
-  /// The [Typedef] built by this builder.
-  @override
-  final Typedef typedef;
+  Typedef? _typedef;
 
   @override
   DartType? thisType;
 
   @override
   Map<Name, Procedure>? tearOffs;
 
+  TypedefFragment _introductory;
+
   SourceTypeAliasBuilder(
-      {required this.metadata,
-      required String name,
-      required List<NominalVariableBuilder>? typeVariables,
-      required this.type,
+      {required String name,
       required SourceLibraryBuilder enclosingLibraryBuilder,
       required Uri fileUri,
       required int fileOffset,
+      required TypedefFragment fragment,
       required Reference? reference})
-      : typedef = new Typedef(name, null,
-            typeParameters: NominalVariableBuilder.typeParametersFromBuilders(
-                typeVariables),
-            fileUri: fileUri,
-            reference: reference)
-          ..fileOffset = fileOffset,
-        _typeVariables = typeVariables,
-        super(name, enclosingLibraryBuilder, fileUri, fileOffset);
+      : _reference = reference ?? new Reference(),
+        _introductory = fragment,
+        _type = fragment.type,
+        super(name, enclosingLibraryBuilder, fileUri, fileOffset) {
+    _introductory.builder = this;
+  }
+
+  @override
+  TypeBuilder get type => _type;
+
+  /// The [Typedef] built by this builder.
+  @override
+  Typedef get typedef {
+    assert(
+        _typedef != null, "Typedef node has not been created yet for $this.");
+    return _typedef!;
+  }
+
+  @override
+  Reference get reference => _reference;
 
   @override
   SourceLibraryBuilder get libraryBuilder =>
       super.libraryBuilder as SourceLibraryBuilder;
 
   @override
-  List<NominalVariableBuilder>? get typeVariables => _typeVariables;
+  List<NominalVariableBuilder>? get typeVariables =>
+      _introductory.typeVariables;
 
   @override
   bool get fromDill => false;
@@ -81,9 +88,15 @@ class SourceTypeAliasBuilder extends TypeAliasBuilderImpl {
 
   void _breakCyclicDependency() {
     if (_hasCheckedForCyclicDependency) return;
+    _typedef = new Typedef(name, null,
+        typeParameters:
+            NominalVariableBuilder.typeParametersFromBuilders(typeVariables),
+        fileUri: fileUri,
+        reference: _reference)
+      ..fileOffset = charOffset;
     if (_checkCyclicTypedefDependency(type, this, {this})) {
       typedef.type = new InvalidType();
-      type = new InvalidTypeBuilderImpl(fileUri, charOffset);
+      _type = new InvalidTypeBuilderImpl(fileUri, charOffset);
     }
     if (typeVariables != null) {
       for (TypeVariableBuilder typeVariable in typeVariables!) {
@@ -97,15 +110,14 @@ class SourceTypeAliasBuilder extends TypeAliasBuilderImpl {
           // The typedef itself can't be used without proper bounds of its type
           // variables, so we set it to mean [InvalidType] too.
           typedef.type = new InvalidType();
-          type = new InvalidTypeBuilderImpl(fileUri, charOffset);
+          _type = new InvalidTypeBuilderImpl(fileUri, charOffset);
         }
       }
     }
     _hasCheckedForCyclicDependency = true;
   }
 
   Typedef build() {
-    _breakCyclicDependency();
     buildThisType();
     return typedef;
   }
@@ -257,8 +269,10 @@ class SourceTypeAliasBuilder extends TypeAliasBuilderImpl {
 
   @override
   DartType buildThisType() {
+    _breakCyclicDependency();
     if (thisType != null) {
       if (identical(thisType, pendingTypeAliasMarker)) {
+        // Coverage-ignore-block(suite): Not run.
         thisType = cyclicTypeAliasMarker;
         assert(libraryBuilder.loader.assertProblemReportedElsewhere(
             "SourceTypeAliasBuilder.buildThisType",
@@ -346,7 +360,7 @@ class SourceTypeAliasBuilder extends TypeAliasBuilderImpl {
       List<DelayedDefaultValueCloner> delayedDefaultValueCloners) {
     MetadataBuilder.buildAnnotations(
         typedef,
-        metadata,
+        _introductory.metadata,
         createBodyBuilderContext(
             inOutlineBuildingPhase: true,
             inMetadata: true,

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

@@ -53,15 +53,12 @@ class _Added {
       case TypedefFragment():
         Reference? reference = indexedLibrary?.lookupTypedef(fragment.name);
         SourceTypeAliasBuilder typedefBuilder = new SourceTypeAliasBuilder(
-            metadata: fragment.metadata,
             name: fragment.name,
-            typeVariables: fragment.typeVariables,
-            type: fragment.type,
             enclosingLibraryBuilder: enclosingLibraryBuilder,
             fileUri: fragment.fileUri,
             fileOffset: fragment.fileOffset,
+            fragment: fragment,
             reference: reference);
-        fragment.builder = typedefBuilder;
         builders.add(new _AddBuilder(fragment.name, typedefBuilder,
             fragment.fileUri, fragment.fileOffset));
         if (reference != null) {

pkg/front_end/test/coverage_suite_expected.dart

@@ -150,7 +150,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/base/incremental_compiler.dart": (
-    hitCount: 849,
+    hitCount: 846,
     missCount: 0,
   ),
   // 100.0%.
@@ -450,7 +450,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/dill/dill_library_builder.dart": (
-    hitCount: 339,
+    hitCount: 335,
     missCount: 0,
   ),
   // 100.0%.
@@ -470,7 +470,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/dill/dill_type_alias_builder.dart": (
-    hitCount: 47,
+    hitCount: 50,
     missCount: 0,
   ),
   // 100.0%.
@@ -856,7 +856,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/source/source_library_builder.dart": (
-    hitCount: 1362,
+    hitCount: 1361,
     missCount: 0,
   ),
   // 100.0%.
@@ -876,7 +876,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/source/source_type_alias_builder.dart": (
-    hitCount: 335,
+    hitCount: 349,
     missCount: 0,
   ),
   // 100.0%.
@@ -886,7 +886,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/source/type_parameter_scope_builder.dart": (
-    hitCount: 698,
+    hitCount: 694,
     missCount: 0,
   ),
   // 100.0%.

pkg/front_end/test/spell_checking_list_code.txt

@@ -906,6 +906,7 @@ interspersed
 interval
 intervals
 intl
+introductory
 introspect
 introspectable
 introspecting