[cfe] Handle redirecting factories in top level inference.

Previously top level inference was triggered before inference of redirecting factories. This only supported dependencies like:

    redirecting factory -> field

A user encountered a crash when a field type depended on a redirecting factory, resulting in the opposite dependency:

    field -> redirecting factory

Redirecting factories are now included in the top level inference, similar to how generative constructors where already handled, by introducing an InferableMember interface. Tests are added that exercises this dependency as well as:

    field -> redirecting factory -> field

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

Author: johnniwinther

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

@@ -230,7 +230,7 @@ class FormalParameterBuilder extends BuilderImpl
     String fieldName = isWildcardLoweredFormalParameter(name) ? '_' : name;
     Builder? fieldBuilder = declarationBuilder.lookupLocalMember(fieldName);
     if (fieldBuilder is SourcePropertyBuilder && fieldBuilder.isField) {
-      DartType fieldType = fieldBuilder.inferType(hierarchy);
+      DartType fieldType = fieldBuilder.inferFieldType(hierarchy);
       fieldType = constructorDeclaration.substituteFieldType(fieldType);
       type.registerInferredType(fieldType);
     } else {

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

@@ -509,7 +509,8 @@ class DillClassMember extends BuilderClassMember {
 
   @override
   // Coverage-ignore(suite): Not run.
-  void registerOverrideDependency(Set<ClassMember> overriddenMembers) {
+  void registerOverrideDependency(
+      ClassMembersBuilder membersBuilder, Set<ClassMember> overriddenMembers) {
     // Do nothing; this is only for source members.
   }
 

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

@@ -200,8 +200,8 @@ class RegularConstructorEncoding {
         }
       }
       if (needsInference) {
-        libraryBuilder.loader
-            .registerConstructorToBeInferred(_constructor, constructorBuilder);
+        libraryBuilder.loader.registerConstructorToBeInferred(
+            new InferableConstructor(_constructor, constructorBuilder));
       }
     }
   }
@@ -500,8 +500,8 @@ class ExtensionTypeConstructorEncoding {
         }
       }
       if (needsInference) {
-        libraryBuilder.loader
-            .registerConstructorToBeInferred(_constructor, constructorBuilder);
+        libraryBuilder.loader.registerConstructorToBeInferred(
+            new InferableConstructor(_constructor, constructorBuilder));
       }
     }
   }

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

@@ -317,6 +317,7 @@ class EnumElementFragment
   }
 
   @override
+  // Coverage-ignore(suite): Not run.
   void ensureTypes(
       ClassMembersBuilder membersBuilder,
       Set<ClassMember>? getterOverrideDependencies,
@@ -434,7 +435,7 @@ class _EnumElementClassMember implements ClassMember {
 
   @override
   Member getMember(ClassMembersBuilder membersBuilder) {
-    _builder.ensureTypes(membersBuilder);
+    inferType(membersBuilder);
     return forSetter
         ?
         // Coverage-ignore(suite): Not run.
@@ -458,9 +459,8 @@ class _EnumElementClassMember implements ClassMember {
   bool get hasDeclarations => false;
 
   @override
-  // Coverage-ignore(suite): Not run.
   void inferType(ClassMembersBuilder membersBuilder) {
-    _builder.ensureTypes(membersBuilder);
+    _builder.inferFieldType(membersBuilder.hierarchyBuilder);
   }
 
   @override
@@ -531,8 +531,10 @@ class _EnumElementClassMember implements ClassMember {
 
   @override
   // Coverage-ignore(suite): Not run.
-  void registerOverrideDependency(Set<ClassMember> overriddenMembers) {
-    _builder.registerGetterOverrideDependency(overriddenMembers);
+  void registerOverrideDependency(
+      ClassMembersBuilder membersBuilder, Set<ClassMember> overriddenMembers) {
+    _builder.registerGetterOverrideDependency(
+        membersBuilder, overriddenMembers);
   }
 
   @override

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

@@ -366,6 +366,7 @@ class FieldFragment
           nameLength: name.length,
           isAssignable: hasSetter);
     } else {
+      // Coverage-ignore-block(suite): Not run.
       type.build(builder.libraryBuilder, TypeUse.fieldType,
           hierarchy: membersBuilder.hierarchyBuilder);
     }

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

@@ -49,7 +49,7 @@ class _FieldClassMember implements ClassMember {
 
   @override
   Member getMember(ClassMembersBuilder membersBuilder) {
-    _builder.ensureTypes(membersBuilder);
+    inferType(membersBuilder);
     return forSetter ? _builder.writeTarget! : _builder.readTarget!;
   }
 
@@ -84,7 +84,7 @@ class _FieldClassMember implements ClassMember {
 
   @override
   void inferType(ClassMembersBuilder membersBuilder) {
-    _builder.ensureTypes(membersBuilder);
+    _builder.inferFieldType(membersBuilder.hierarchyBuilder);
   }
 
   @override
@@ -150,11 +150,14 @@ class _FieldClassMember implements ClassMember {
   Name get name => _builder.memberName;
 
   @override
-  void registerOverrideDependency(Set<ClassMember> overriddenMembers) {
+  void registerOverrideDependency(
+      ClassMembersBuilder membersBuilder, Set<ClassMember> overriddenMembers) {
     if (forSetter) {
-      _builder.registerSetterOverrideDependency(overriddenMembers);
+      _builder.registerSetterOverrideDependency(
+          membersBuilder, overriddenMembers);
     } else {
-      _builder.registerGetterOverrideDependency(overriddenMembers);
+      _builder.registerGetterOverrideDependency(
+          membersBuilder, overriddenMembers);
     }
   }
 
@@ -183,14 +186,14 @@ class _SynthesizedFieldClassMember implements ClassMember {
 
   @override
   Member getMember(ClassMembersBuilder membersBuilder) {
-    _builder.ensureTypes(membersBuilder);
+    inferType(membersBuilder);
     return _member;
   }
 
   @override
   Member? getTearOff(ClassMembersBuilder membersBuilder) {
     // Ensure field type is computed.
-    getMember(membersBuilder);
+    inferType(membersBuilder);
     return null;
   }
 
@@ -209,15 +212,18 @@ class _SynthesizedFieldClassMember implements ClassMember {
 
   @override
   void inferType(ClassMembersBuilder membersBuilder) {
-    _builder.ensureTypes(membersBuilder);
+    _builder.inferFieldType(membersBuilder.hierarchyBuilder);
   }
 
   @override
-  void registerOverrideDependency(Set<ClassMember> overriddenMembers) {
+  void registerOverrideDependency(
+      ClassMembersBuilder membersBuilder, Set<ClassMember> overriddenMembers) {
     if (forSetter) {
-      _builder.registerSetterOverrideDependency(overriddenMembers);
+      _builder.registerSetterOverrideDependency(
+          membersBuilder, overriddenMembers);
     } else {
-      _builder.registerGetterOverrideDependency(overriddenMembers);
+      _builder.registerGetterOverrideDependency(
+          membersBuilder, overriddenMembers);
     }
   }
 

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

@@ -185,7 +185,9 @@ enum BenchmarkPhases {
   outline_buildClassHierarchyMembers,
   outline_computeHierarchy,
   outline_installTypedefTearOffs,
+  outline_prepareTopLevelInference,
   outline_performRedirectingFactoryInference,
+  outline_computeMemberTypes,
   outline_performTopLevelInference,
   outline_checkOverrides,
   outline_checkAbstractMembers,

pkg/front_end/lib/src/kernel/hierarchy/class_member.dart

@@ -339,7 +339,8 @@ abstract class ClassMember {
   /// Registers that this class member overrides [overriddenMembers].
   ///
   /// This is used to infer types from the [overriddenMembers].
-  void registerOverrideDependency(Set<ClassMember> overriddenMembers);
+  void registerOverrideDependency(
+      ClassMembersBuilder membersBuilder, Set<ClassMember> overriddenMembers);
 
   /// Returns `true` if this has the same underlying declaration as [other].
   ///
@@ -400,7 +401,8 @@ abstract class SynthesizedMember extends ClassMember {
 
   @override
   // Coverage-ignore(suite): Not run.
-  void registerOverrideDependency(Set<ClassMember> overriddenMembers) {}
+  void registerOverrideDependency(
+      ClassMembersBuilder membersBuilder, Set<ClassMember> overriddenMembers) {}
 
   @override
   MemberResult getMemberResult(ClassMembersBuilder membersBuilder) {

pkg/front_end/lib/src/kernel/hierarchy/members_node.dart

@@ -967,7 +967,8 @@ class ClassMembersNodeBuilder extends MembersNodeBuilder {
         /// Member types can be queried at arbitrary points during top level
         /// inference so we need to ensure that types are computed in dependency
         /// order.
-        classMember.registerOverrideDependency(overriddenMembers);
+        classMember.registerOverrideDependency(
+            _membersBuilder, overriddenMembers);
 
         /// Not all member type are queried during top level inference so we
         /// register delayed computation to ensure that all types have been

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

@@ -541,14 +541,23 @@ class KernelTarget {
           ?.enterPhase(BenchmarkPhases.outline_computeFieldPromotability);
       loader.computeFieldPromotability();
 
+      benchmarker
+          // Coverage-ignore(suite): Not run.
+          ?.enterPhase(BenchmarkPhases.outline_prepareTopLevelInference);
+      loader.prepareTopLevelInference();
+
       benchmarker
           // Coverage-ignore(suite): Not run.
           ?.enterPhase(
               BenchmarkPhases.outline_performRedirectingFactoryInference);
       // TODO(johnniwinther): Add an interface for registering delayed actions.
       List<DelayedDefaultValueCloner> delayedDefaultValueCloners = [];
-      loader.inferRedirectingFactories(
-          loader.hierarchy, delayedDefaultValueCloners);
+      loader.inferRedirectingFactories(delayedDefaultValueCloners);
+
+      benchmarker
+          // Coverage-ignore(suite): Not run.
+          ?.enterPhase(BenchmarkPhases.outline_computeMemberTypes);
+      loader.computeMemberTypes();
 
       benchmarker
           // Coverage-ignore(suite): Not run.
@@ -1143,7 +1152,8 @@ class KernelTarget {
             definingConstructor: superConstructorBuilder,
             delayedDefaultValueCloner: delayedDefaultValueCloner,
             typeDependency: typeDependency);
-    loader.registerConstructorToBeInferred(constructor, constructorBuilder);
+    loader.registerConstructorToBeInferred(
+        new InferableConstructor(constructor, constructorBuilder));
     return constructorBuilder;
   }