[cfe] Remove InferenceHelper

This removes the InferenceHelper interface which was implemented by the BodyBuilder and moves functions to the CheckHelper extension.

This is a step towards separating BodyBuilder from inference.

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

Author: johnniwinther

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

@@ -82,7 +82,6 @@ import '../builder/declaration_builders.dart'
     show ClassBuilder, ExtensionBuilder, ExtensionTypeDeclarationBuilder;
 import '../builder/library_builder.dart' show LibraryBuilder;
 import '../builder/member_builder.dart' show MemberBuilder;
-import '../codes/cfe_codes.dart';
 import '../dill/dill_class_builder.dart' show DillClassBuilder;
 import '../dill/dill_library_builder.dart' show DillLibraryBuilder;
 import '../dill/dill_loader.dart' show DillLoader;
@@ -91,11 +90,11 @@ import '../kernel/benchmarker.dart' show BenchmarkPhases, Benchmarker;
 import '../kernel/hierarchy/hierarchy_builder.dart' show ClassHierarchyBuilder;
 import '../kernel/internal_ast.dart' show VariableDeclarationImpl;
 import '../kernel/kernel_target.dart' show BuildResult, KernelTarget;
+import '../source/check_helper.dart';
 import '../source/source_compilation_unit.dart' show SourceCompilationUnitImpl;
 import '../source/source_library_builder.dart'
     show ImplicitLanguageVersion, SourceLibraryBuilder;
 import '../source/source_loader.dart';
-import '../type_inference/inference_helper.dart' show InferenceHelper;
 import '../type_inference/inference_visitor.dart'
     show ExpressionEvaluationHelper, OverwrittenInterfaceMember;
 import '../util/error_reporter_file_copier.dart' show saveAsGzip;
@@ -108,6 +107,7 @@ import 'compiler_context.dart' show CompilerContext;
 import 'hybrid_file_system.dart' show HybridFileSystem;
 import 'incremental_serializer.dart' show IncrementalSerializer;
 import 'library_graph.dart' show LibraryGraph;
+import 'messages.dart';
 import 'ticker.dart' show Ticker;
 import 'uri_translator.dart' show UriTranslator;
 import 'uris.dart' show getPartUri;
@@ -2475,10 +2475,18 @@ class ExpressionEvaluationHelperImpl implements ExpressionEvaluationHelper {
   ExpressionInferenceResult? visitVariableGet(
     VariableGet node,
     DartType typeContext,
-    InferenceHelper helper,
+    ProblemReporting problemReporting,
+    CompilerContext compilerContext,
+    Uri fileUri,
   ) {
     if (knownButUnavailable.contains(node.variable)) {
-      return _returnKnownVariableUnavailable(node, node.variable, helper);
+      return _returnKnownVariableUnavailable(
+        node,
+        node.variable,
+        problemReporting,
+        compilerContext,
+        fileUri,
+      );
     }
     return null;
   }
@@ -2487,28 +2495,39 @@ class ExpressionEvaluationHelperImpl implements ExpressionEvaluationHelper {
   ExpressionInferenceResult? visitVariableSet(
     VariableSet node,
     DartType typeContext,
-    InferenceHelper helper,
+    ProblemReporting problemReporting,
+    CompilerContext compilerContext,
+    Uri fileUri,
   ) {
     if (knownButUnavailable.contains(node.variable)) {
-      return _returnKnownVariableUnavailable(node, node.variable, helper);
+      return _returnKnownVariableUnavailable(
+        node,
+        node.variable,
+        problemReporting,
+        compilerContext,
+        fileUri,
+      );
     }
     return null;
   }
 
   ExpressionInferenceResult _returnKnownVariableUnavailable(
     Expression node,
     VariableDeclaration variable,
-    InferenceHelper helper,
+    ProblemReporting problemReporting,
+    CompilerContext compilerContext,
+    Uri fileUri,
   ) {
     return new ExpressionInferenceResult(
       variable.type,
-      helper.wrapInProblem(
-        node,
-        codeExpressionEvaluationKnownVariableUnavailable.withArgumentsOld(
-          variable.name!,
-        ),
-        node.fileOffset,
-        variable.name!.length,
+      problemReporting.wrapInProblem(
+        compilerContext: compilerContext,
+        expression: node,
+        message: codeExpressionEvaluationKnownVariableUnavailable
+            .withArgumentsOld(variable.name!),
+        fileUri: fileUri,
+        fileOffset: node.fileOffset,
+        length: variable.name!.length,
         errorHasBeenReported: false,
         includeExpression: false,
       ),

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

@@ -303,16 +303,18 @@ class FormalParameterBuilder extends NamedBuilderImpl
               scope,
               fileUri,
             );
-        bodyBuilder.constantContext = ConstantContext.required;
+        ConstantContext constantContext = ConstantContext.required;
+        bodyBuilder.constantContext = constantContext;
         assert(!initializerWasInferred);
         Expression initializer = bodyBuilder.parseFieldInitializer(
           initializerToken!,
         );
         initializer = bodyBuilder.typeInferrer.inferParameterInitializer(
-          bodyBuilder,
-          initializer,
-          variable!.type,
-          hasDeclaredInitializer,
+          fileUri: fileUri,
+          initializer: initializer,
+          declaredType: variable!.type,
+          hasDeclaredInitializer: hasDeclaredInitializer,
+          constantContext: constantContext,
         );
         variable!.initializer = initializer..parent = variable;
         if (initializer is InvalidExpression) {

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

@@ -127,12 +127,18 @@ class ConstructorBodyBuilderContext extends BodyBuilderContext {
   }
 
   @override
-  InitializerInferenceResult inferInitializer(
-    Initializer initializer,
-    ExpressionGeneratorHelper helper,
-    TypeInferrer typeInferrer,
-  ) {
-    return typeInferrer.inferInitializer(helper, _builder, initializer);
+  InitializerInferenceResult inferInitializer({
+    required TypeInferrer typeInferrer,
+    required Uri fileUri,
+    required ConstantContext constantContext,
+    required Initializer initializer,
+  }) {
+    return typeInferrer.inferInitializer(
+      fileUri: fileUri,
+      constantContext: constantContext,
+      constructorBuilder: _builder,
+      initializer: initializer,
+    );
   }
 
   @override

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

@@ -364,14 +364,15 @@ class EnumElementDeclaration
       // aren't provided, but required, we'll use it to infer them, and
       // 3) in case of erroneous code the constructor invocation should
       // be built via a body builder to detect potential errors.
+      ConstantContext constantContext = ConstantContext.inferred;
       BodyBuilder bodyBuilder = libraryBuilder.loader
           .createBodyBuilderForOutlineExpression(
             libraryBuilder,
             sourceEnumBuilder.createBodyBuilderContext(),
             _fragment.enclosingScope,
             fileUri,
           );
-      bodyBuilder.constantContext = ConstantContext.inferred;
+      bodyBuilder.constantContext = constantContext;
 
       ArgumentsImpl arguments;
       if (token != null) {
@@ -420,9 +421,10 @@ class EnumElementDeclaration
         );
         ExpressionInferenceResult inferenceResult = bodyBuilder.typeInferrer
             .inferFieldInitializer(
-              bodyBuilder,
-              const UnknownType(),
-              initializer,
+              fileUri: fileUri,
+              constantContext: constantContext,
+              declaredType: const UnknownType(),
+              initializer: initializer,
             );
         initializer = inferenceResult.expression;
         inferredFieldType = inferenceResult.inferredType;

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

@@ -7,6 +7,7 @@ import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/type_algebra.dart';
 import 'package:kernel/type_environment.dart';
 
+import '../../base/constant_context.dart';
 import '../../base/identifiers.dart';
 import '../../base/lookup_result.dart';
 import '../../base/messages.dart';
@@ -37,7 +38,6 @@ import '../../source/source_loader.dart' show SourceLoader;
 import '../../source/source_member_builder.dart';
 import '../../source/source_type_parameter_builder.dart';
 import '../../source/type_parameter_factory.dart';
-import '../../type_inference/inference_helper.dart';
 import '../../type_inference/type_inferrer.dart';
 import '../../type_inference/type_schema.dart';
 
@@ -246,13 +246,6 @@ class FactoryEncoding implements InferredTypeListener {
             _fragment.typeParameterScope,
             null,
           );
-      InferenceHelper helper = libraryBuilder.loader
-          .createBodyBuilderForOutlineExpression(
-            libraryBuilder,
-            bodyBuilderContext,
-            _fragment.enclosingScope,
-            _fragment.fileUri,
-          );
       MemberLookupResult? result = _redirectionTarget.target;
       MemberBuilder? targetBuilder;
       if (result != null && !result.isInvalidLookup) {
@@ -281,12 +274,15 @@ class FactoryEncoding implements InferredTypeListener {
       }
 
       typeArguments = inferrer.inferRedirectingFactoryTypeArguments(
-        helper,
-        _procedure.function.returnType,
-        _procedure.function,
-        _fragment.fullNameOffset,
-        target,
-        target.function!.computeFunctionType(Nullability.nonNullable),
+        typeContext: _procedure.function.returnType,
+        redirectingFactoryFunction: _procedure.function,
+        fileUri: _fragment.fileUri,
+        fileOffset: _fragment.fullNameOffset,
+        target: target,
+        targetType: target.function!.computeFunctionType(
+          Nullability.nonNullable,
+        ),
+        constantContext: ConstantContext.none,
       );
       if (typeArguments == null) {
         assert(

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

@@ -35,7 +35,6 @@ import '../../source/source_library_builder.dart';
 import '../../source/source_member_builder.dart';
 import '../../source/source_property_builder.dart';
 import '../../source/type_parameter_factory.dart';
-import '../../type_inference/inference_helper.dart';
 import '../../type_inference/type_inference_engine.dart';
 import '../../type_inference/type_inferrer.dart';
 import '../fragment.dart';
@@ -311,16 +310,22 @@ class RegularFieldDeclaration
   }
 
   @override
-  void buildFieldInitializer(
-    InferenceHelper helper,
-    TypeInferrer typeInferrer,
-    CoreTypes coreTypes,
+  void buildFieldInitializer({
+    required TypeInferrer typeInferrer,
+    required CoreTypes coreTypes,
+    required Uri fileUri,
+    required ConstantContext constantContext,
     Expression? initializer,
-  ) {
+  }) {
     if (initializer != null) {
       if (!hasBodyBeenBuilt) {
         initializer = typeInferrer
-            .inferFieldInitializer(helper, fieldType, initializer)
+            .inferFieldInitializer(
+              fileUri: fileUri,
+              constantContext: constantContext,
+              declaredType: fieldType,
+              initializer: initializer,
+            )
             .expression;
         buildBody(coreTypes, initializer);
       }
@@ -390,14 +395,16 @@ class RegularFieldDeclaration
             scope,
             fileUri,
           );
-      bodyBuilder.constantContext = _fragment.modifiers.isConst
+      ConstantContext constantContext = _fragment.modifiers.isConst
           ? ConstantContext.inferred
           : ConstantContext.required;
+      bodyBuilder.constantContext = constantContext;
       Expression initializer = bodyBuilder.typeInferrer
           .inferFieldInitializer(
-            bodyBuilder,
-            fieldType,
-            bodyBuilder.parseFieldInitializer(token),
+            fileUri: fileUri,
+            constantContext: constantContext,
+            declaredType: fieldType,
+            initializer: bodyBuilder.parseFieldInitializer(token),
           )
           .expression;
       buildBody(classHierarchy.coreTypes, initializer);
@@ -683,16 +690,18 @@ class RegularFieldDeclaration
         typeInferrer,
         fileUri,
       );
-      bodyBuilder.constantContext = _fragment.modifiers.isConst
+      ConstantContext constantContext = _fragment.modifiers.isConst
           ? ConstantContext.inferred
           : ConstantContext.none;
+      bodyBuilder.constantContext = constantContext;
       bodyBuilder.inFieldInitializer = true;
       bodyBuilder.inLateFieldInitializer = _fragment.modifiers.isLate;
       Expression initializer = bodyBuilder.parseFieldInitializer(token);
 
       inferredType = typeInferrer.inferImplicitFieldType(
-        bodyBuilder,
-        initializer,
+        fileUri: fileUri,
+        constantContext: constantContext,
+        initializer: initializer,
       );
     } else {
       inferredType = const DynamicType();
@@ -931,12 +940,13 @@ mixin FieldDeclarationMixin
 abstract class FieldFragmentDeclaration {
   bool get isStatic;
 
-  void buildFieldInitializer(
-    InferenceHelper helper,
-    TypeInferrer typeInferrer,
-    CoreTypes coreTypes,
+  void buildFieldInitializer({
+    required TypeInferrer typeInferrer,
+    required CoreTypes coreTypes,
+    required Uri fileUri,
+    required ConstantContext constantContext,
     Expression? initializer,
-  );
+  });
 
   BodyBuilderContext createBodyBuilderContext();
 

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

@@ -61,7 +61,6 @@ import '../source/source_property_builder.dart';
 import '../source/source_type_alias_builder.dart';
 import '../source/source_type_parameter_builder.dart';
 import '../source/type_parameter_factory.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';

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

@@ -125,16 +125,22 @@ class PrimaryConstructorFieldDeclaration
 
   @override
   // Coverage-ignore(suite): Not run.
-  void buildFieldInitializer(
-    InferenceHelper helper,
-    TypeInferrer typeInferrer,
-    CoreTypes coreTypes,
+  void buildFieldInitializer({
+    required TypeInferrer typeInferrer,
+    required CoreTypes coreTypes,
+    required Uri fileUri,
+    required ConstantContext constantContext,
     Expression? initializer,
-  ) {
+  }) {
     if (initializer != null) {
       if (!hasBodyBeenBuilt) {
         initializer = typeInferrer
-            .inferFieldInitializer(helper, fieldType, initializer)
+            .inferFieldInitializer(
+              fileUri: fileUri,
+              constantContext: constantContext,
+              declaredType: fieldType,
+              initializer: initializer,
+            )
             .expression;
         buildBody(coreTypes, initializer);
       }
@@ -443,14 +449,16 @@ class PrimaryConstructorFieldDeclaration
         typeInferrer,
         fileUri,
       );
-      bodyBuilder.constantContext = ConstantContext.none;
+      ConstantContext constantContext = ConstantContext.none;
+      bodyBuilder.constantContext = constantContext;
       bodyBuilder.inFieldInitializer = true;
       bodyBuilder.inLateFieldInitializer = false;
       Expression initializer = bodyBuilder.parseFieldInitializer(token);
 
       inferredType = typeInferrer.inferImplicitFieldType(
-        bodyBuilder,
-        initializer,
+        fileUri: fileUri,
+        constantContext: constantContext,
+        initializer: initializer,
       );
     } else {
       inferredType = const DynamicType();