[cfe] Lookup classes/extension type from references

This adds a ReferenceMap for mapping reference from previous
incremental compilation steps to source builders in the current
compilation. This replaces the `buildersCreatedWithReferences` map,
encapsulating its usage.

When create TypeBuilder for DartType, the AST nodes might not have
been fully created yet, so in order to avoid relying on the parent
relation, we first lookup whether the Reference have a corresponding
builder.

Fixes flutter/flutter#171963

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

Author: johnniwinther

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

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

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

@@ -27,6 +27,7 @@ import '../codes/cfe_codes.dart'
 import '../kernel/constructor_tearoff_lowering.dart';
 import '../kernel/utils.dart';
 import '../source/name_scheme.dart';
+import '../util/reference_map.dart';
 import 'dill_class_builder.dart' show DillClassBuilder;
 import 'dill_extension_builder.dart';
 import 'dill_extension_type_declaration_builder.dart';
@@ -418,11 +419,11 @@ class DillLibraryBuilder extends LibraryBuilderImpl {
       _exportNameSpace.addLocalMember(name, declaration, setter: false);
     });
 
-    Map<Reference, NamedBuilder>? sourceBuildersMap =
-        loader.currentSourceLoader?.buildersCreatedWithReferences;
+    ReferenceMap? sourceBuildersMap = loader.currentSourceLoader?.referenceMap;
     for (Reference reference in library.additionalExports) {
       NamedNode node = reference.node as NamedNode;
-      NamedBuilder? declaration = sourceBuildersMap?[reference];
+      NamedBuilder? declaration =
+          sourceBuildersMap?.lookupNamedBuilder(reference);
       String name;
       if (declaration != null) {
         // Coverage-ignore-block(suite): Not run.

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

@@ -324,9 +324,15 @@ severity: $severity
 
   @override
   ClassBuilder computeClassBuilderFromTargetClass(Class cls) {
+    ClassBuilder? classBuilder =
+        currentSourceLoader?.referenceMap.lookupClassBuilder(cls.reference);
+    if (classBuilder != null) {
+      return classBuilder;
+    }
     Library kernelLibrary = cls.enclosingLibrary;
     LibraryBuilder? library = lookupLibraryBuilder(kernelLibrary.importUri);
     if (library == null) {
+      // Coverage-ignore-block(suite): Not run.
       library = currentSourceLoader
           ?.lookupLoadedLibraryBuilder(kernelLibrary.importUri);
     }
@@ -337,9 +343,16 @@ severity: $severity
   ExtensionTypeDeclarationBuilder
       computeExtensionTypeBuilderFromTargetExtensionType(
           ExtensionTypeDeclaration extensionType) {
+    ExtensionTypeDeclarationBuilder? extensionTypeDeclarationBuilder =
+        currentSourceLoader?.referenceMap
+            .lookupExtensionTypeDeclarationBuilder(extensionType.reference);
+    if (extensionTypeDeclarationBuilder != null) {
+      return extensionTypeDeclarationBuilder;
+    }
     Library library = extensionType.enclosingLibrary;
     LibraryBuilder? libraryBuilder = lookupLibraryBuilder(library.importUri);
     if (libraryBuilder == null) {
+      // Coverage-ignore-block(suite): Not run.
       libraryBuilder =
           currentSourceLoader?.lookupLoadedLibraryBuilder(library.importUri);
     }

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

@@ -626,7 +626,8 @@ class KernelTarget {
       sortedSourceClassBuilders = null;
 
       return new BuildResult(component: component);
-    }, () => loader.currentUriForCrashReporting);
+    }, // Coverage-ignore(suite): Not run.
+        () => loader.currentUriForCrashReporting);
   }
 
   /// Build the kernel representation of the component loaded by this

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

@@ -298,8 +298,8 @@ class BuilderFactory {
       augmentations.clear();
     }
     if (indexedClass != null) {
-      _loader.buildersCreatedWithReferences[indexedClass.reference] =
-          classBuilder;
+      _loader.referenceMap
+          .registerNamedBuilder(indexedClass.reference, classBuilder);
     }
     _builderRegistry.registerBuilder(
         declaration: classBuilder,
@@ -343,7 +343,8 @@ class BuilderFactory {
         introductory: constructorDeclaration,
         augmentations: augmentationDeclarations,
         isConst: isConst);
-    constructorReferences.registerReference(_loader, constructorBuilder);
+    constructorReferences.registerReference(
+        _loader.referenceMap, constructorBuilder);
 
     constructorDeclaration.createEncoding(
         problemReporting: _problemReporting,
@@ -585,8 +586,8 @@ class BuilderFactory {
     fragment.builder = enumBuilder;
     fragment.bodyScope.declarationBuilder = enumBuilder;
     if (indexedClass != null) {
-      _loader.buildersCreatedWithReferences[indexedClass.reference] =
-          enumBuilder;
+      _loader.referenceMap
+          .registerNamedBuilder(indexedClass.reference, enumBuilder);
     }
     _builderRegistry.registerBuilder(
         declaration: enumBuilder,
@@ -671,7 +672,7 @@ class BuilderFactory {
         nameSpaceBuilder: nameSpaceBuilder,
         reference: reference);
     if (reference != null) {
-      _loader.buildersCreatedWithReferences[reference] = extensionBuilder;
+      _loader.referenceMap.registerNamedBuilder(reference, extensionBuilder);
     }
     _builderRegistry.registerBuilder(
         declaration: extensionBuilder,
@@ -706,8 +707,8 @@ class BuilderFactory {
             indexedContainer: indexedContainer,
             representationFieldFragment: representationFieldFragment);
     if (indexedContainer?.reference != null) {
-      _loader.buildersCreatedWithReferences[indexedContainer!.reference] =
-          extensionTypeDeclarationBuilder;
+      _loader.referenceMap.registerNamedBuilder(
+          indexedContainer!.reference, extensionTypeDeclarationBuilder);
     }
     _builderRegistry.registerBuilder(
         declaration: extensionTypeDeclarationBuilder,
@@ -776,7 +777,7 @@ class BuilderFactory {
           encodingStrategy: encodingStrategy);
     }
 
-    factoryReferences.registerReference(_loader, factoryBuilder);
+    factoryReferences.registerReference(_loader.referenceMap, factoryBuilder);
     _builderRegistry.registerBuilder(
         declaration: factoryBuilder, uriOffset: uriOffset, inPatch: inPatch);
   }
@@ -877,7 +878,8 @@ class BuilderFactory {
     }
 
     if (procedureReference != null) {
-      _loader.buildersCreatedWithReferences[procedureReference] = methodBuilder;
+      _loader.referenceMap
+          .registerNamedBuilder(procedureReference, methodBuilder);
     }
     _builderRegistry.registerBuilder(
         declaration: methodBuilder,
@@ -910,8 +912,8 @@ class BuilderFactory {
     fragment.builder = mixinBuilder;
     fragment.bodyScope.declarationBuilder = mixinBuilder;
     if (indexedClass != null) {
-      _loader.buildersCreatedWithReferences[indexedClass.reference] =
-          mixinBuilder;
+      _loader.referenceMap
+          .registerNamedBuilder(indexedClass.reference, mixinBuilder);
     }
     _builderRegistry.registerBuilder(
         declaration: mixinBuilder,
@@ -955,8 +957,8 @@ class BuilderFactory {
     _mixinApplications[classBuilder] = mixin;
     fragment.builder = classBuilder;
     if (referencesFromIndexedClass != null) {
-      _loader.buildersCreatedWithReferences[
-          referencesFromIndexedClass.reference] = classBuilder;
+      _loader.referenceMap.registerNamedBuilder(
+          referencesFromIndexedClass.reference, classBuilder);
     }
     _builderRegistry.registerBuilder(
         declaration: classBuilder,
@@ -1059,7 +1061,7 @@ class BuilderFactory {
           propertyEncodingStrategy, _typeParameterFactory);
     }
 
-    references.registerReference(_loader, propertyBuilder);
+    references.registerReference(_loader.referenceMap, propertyBuilder);
 
     _builderRegistry.registerBuilder(
         declaration: propertyBuilder, uriOffset: uriOffset, inPatch: inPatch);
@@ -1088,7 +1090,7 @@ class BuilderFactory {
         fragment: fragment,
         reference: reference);
     if (reference != null) {
-      _loader.buildersCreatedWithReferences[reference] = typedefBuilder;
+      _loader.referenceMap.registerNamedBuilder(reference, typedefBuilder);
     }
     _builderRegistry.registerBuilder(
         declaration: typedefBuilder,

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

@@ -315,8 +315,8 @@ class SourceClassBuilder extends ClassBuilderImpl
         onAnonymousMixin: (SourceClassBuilder anonymousMixinBuilder) {
           Reference? reference = anonymousMixinBuilder.indexedClass?.reference;
           if (reference != null) {
-            loader.buildersCreatedWithReferences[reference] =
-                anonymousMixinBuilder;
+            loader.referenceMap
+                .registerNamedBuilder(reference, anonymousMixinBuilder);
           }
           addAnonymousMixinClassBuilder(anonymousMixinBuilder);
           anonymousMixinBuilder.buildScopes(loader.coreLibrary);

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

@@ -35,6 +35,7 @@ import '../kernel/kernel_helper.dart' show DelayedDefaultValueCloner;
 import '../kernel/type_algorithms.dart';
 import '../type_inference/inference_results.dart';
 import '../type_inference/type_inference_engine.dart';
+import '../util/reference_map.dart';
 import 'name_scheme.dart';
 import 'source_class_builder.dart';
 import 'source_library_builder.dart' show SourceLibraryBuilder;
@@ -667,12 +668,12 @@ class ConstructorReferences {
   /// This must be called before [constructorReference] and [tearOffReference]
   /// are accessed.
   void registerReference(
-      SourceLoader loader, SourceConstructorBuilder builder) {
+      ReferenceMap referenceMap, SourceConstructorBuilder builder) {
     if (_constructorReference != null) {
-      loader.buildersCreatedWithReferences[_constructorReference!] = builder;
+      referenceMap.registerNamedBuilder(_constructorReference!, builder);
     }
     if (_tearOffReference != null) {
-      loader.buildersCreatedWithReferences[_tearOffReference!] = builder;
+      referenceMap.registerNamedBuilder(_tearOffReference!, builder);
     }
   }
 

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

@@ -21,6 +21,7 @@ import '../kernel/hierarchy/class_member.dart';
 import '../kernel/kernel_helper.dart';
 import '../kernel/type_algorithms.dart';
 import '../type_inference/type_inference_engine.dart';
+import '../util/reference_map.dart';
 import 'name_scheme.dart';
 import 'source_class_builder.dart';
 import 'source_library_builder.dart' show SourceLibraryBuilder;
@@ -405,12 +406,13 @@ class FactoryReferences {
   ///
   /// This must be called before [factoryReference] and [tearOffReference] are
   /// accessed.
-  void registerReference(SourceLoader loader, SourceFactoryBuilder builder) {
+  void registerReference(
+      ReferenceMap referenceMap, SourceFactoryBuilder builder) {
     if (_factoryReference != null) {
-      loader.buildersCreatedWithReferences[_factoryReference!] = builder;
+      referenceMap.registerNamedBuilder(_factoryReference!, builder);
     }
     if (_tearOffReference != null) {
-      loader.buildersCreatedWithReferences[_tearOffReference!] = builder;
+      referenceMap.registerNamedBuilder(_tearOffReference!, builder);
     }
   }
 

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

@@ -70,6 +70,7 @@ import '../kernel/kernel_target.dart' show KernelTarget;
 import '../kernel/type_builder_computer.dart' show TypeBuilderComputer;
 import '../type_inference/type_inference_engine.dart';
 import '../type_inference/type_inferrer.dart';
+import '../util/reference_map.dart';
 import 'diet_listener.dart' show DietListener;
 import 'diet_parser.dart' show DietParser, useImplicitCreationExpressionInCfe;
 import 'offset_map.dart';
@@ -109,10 +110,7 @@ class SourceLoader extends Loader {
   CoreTypes? _coreTypes;
   TypeEnvironment? _typeEnvironment;
 
-  /// For builders created with a reference, this maps from that reference to
-  /// that builder. This is used for looking up source builders when finalizing
-  /// exports in dill builders.
-  Map<Reference, NamedBuilder> buildersCreatedWithReferences = {};
+  final ReferenceMap referenceMap = new ReferenceMap();
 
   /// Used when checking whether a return type of an async function is valid.
   ///
@@ -2736,6 +2734,10 @@ severity: $severity
 
   @override
   ClassBuilder computeClassBuilderFromTargetClass(Class cls) {
+    ClassBuilder? classBuilder = referenceMap.lookupClassBuilder(cls.reference);
+    if (classBuilder != null) {
+      return classBuilder;
+    }
     Library library = cls.enclosingLibrary;
     LibraryBuilder? libraryBuilder =
         lookupLoadedLibraryBuilder(library.importUri);
@@ -2749,6 +2751,12 @@ severity: $severity
   ExtensionTypeDeclarationBuilder
       computeExtensionTypeBuilderFromTargetExtensionType(
           ExtensionTypeDeclaration extensionType) {
+    ExtensionTypeDeclarationBuilder? extensionTypeDeclarationBuilder =
+        referenceMap
+            .lookupExtensionTypeDeclarationBuilder(extensionType.reference);
+    if (extensionTypeDeclarationBuilder != null) {
+      return extensionTypeDeclarationBuilder;
+    }
     Library kernelLibrary = extensionType.enclosingLibrary;
     LibraryBuilder? library =
         lookupLoadedLibraryBuilder(kernelLibrary.importUri);

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

@@ -24,10 +24,10 @@ import '../kernel/hierarchy/members_builder.dart';
 import '../kernel/kernel_helper.dart';
 import '../kernel/member_covariance.dart';
 import '../kernel/type_algorithms.dart';
+import '../util/reference_map.dart';
 import 'name_scheme.dart';
 import 'source_class_builder.dart';
 import 'source_library_builder.dart';
-import 'source_loader.dart';
 import 'source_member_builder.dart';
 
 class SourcePropertyBuilder extends SourceMemberBuilderImpl
@@ -901,15 +901,16 @@ class PropertyReferences {
   ///
   /// This must be called before [fieldReference], [getterReference] and
   /// [setterReference] are accessed.
-  void registerReference(SourceLoader loader, SourcePropertyBuilder builder) {
+  void registerReference(
+      ReferenceMap referenceMap, SourcePropertyBuilder builder) {
     if (_fieldReference != null) {
-      loader.buildersCreatedWithReferences[_fieldReference!] = builder;
+      referenceMap.registerNamedBuilder(_fieldReference!, builder);
     }
     if (_getterReference != null) {
-      loader.buildersCreatedWithReferences[_getterReference!] = builder;
+      referenceMap.registerNamedBuilder(_getterReference!, builder);
     }
     if (_setterReference != null) {
-      loader.buildersCreatedWithReferences[_setterReference!] = builder;
+      referenceMap.registerNamedBuilder(_setterReference!, builder);
     }
   }