[cfe] Separate TypeInferrer from BodyBuilder

The Resolver now holds the BodyBuilder and TypeInferrer and calls them in succession. This prepares for further separation between the nodes created during body builder and the nodes created after inference.

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

Author: johnniwinther

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

@@ -85,7 +85,6 @@ mixin LocalScopeMixin implements LocalScope {
   void _recordUse(String name, int charOffset) {}
 
   @override
-  // Coverage-ignore(suite): Not run.
   void forEachExtension(void Function(ExtensionBuilder) f) {
     _parent?.forEachExtension(f);
   }
@@ -255,7 +254,6 @@ final class EnclosingLocalScope extends BaseLocalScope
   VariableBuilder? lookupLocalVariable(String name) => null;
 
   @override
-  // Coverage-ignore(suite): Not run.
   void forEachExtension(void Function(ExtensionBuilder) f) {
     _scope.forEachExtension(f);
   }

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

@@ -25,8 +25,7 @@ abstract class ComputedNameSpace implements NameSpace {
   /// Returns a filtered iterator of members and setters mapped in this name
   /// space.
   ///
-  /// Only members of type [T] are included. If [parent] is provided, on members
-  /// declared in [parent] are included. Duplicates are not included.
+  /// Only members of type [T] are included. Duplicates are not included.
   Iterator<T> filteredIterator<T extends NamedBuilder>();
 }
 

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

@@ -2,17 +2,18 @@
 // 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.
 
+import 'package:front_end/src/base/messages.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/core_types.dart';
 import 'package:kernel/transformations/flags.dart';
 
+import '../../base/compiler_context.dart';
 import '../../base/constant_context.dart';
 import '../../base/identifiers.dart';
 import '../../base/local_scope.dart';
 import '../../builder/formal_parameter_builder.dart';
 import '../../builder/type_builder.dart';
 import '../../kernel/body_builder_context.dart';
-import '../../kernel/expression_generator_helper.dart';
 import '../../source/source_constructor_builder.dart';
 import '../../source/source_property_builder.dart';
 import '../../type_inference/inference_results.dart';
@@ -101,28 +102,36 @@ class ConstructorBodyBuilderContext extends BodyBuilderContext {
   }
 
   @override
-  void addInitializer(
+  bool addInitializer(
+    CompilerContext compilerContext,
+    ProblemReporting problemReporting,
     Initializer initializer,
-    ExpressionGeneratorHelper helper,
+    Uri fileUri,
   ) {
-    _builder.addInitializer(
+    return _builder.addInitializer(
+      compilerContext,
+      problemReporting,
       initializer,
-      helper,
       inferenceResult: null,
       parent: _member,
+      fileUri: fileUri,
     );
   }
 
   @override
-  void addInferredInitializer(
+  bool addInferredInitializer(
+    CompilerContext compilerContext,
+    ProblemReporting problemReporting,
     InitializerInferenceResult inferenceResult,
-    ExpressionGeneratorHelper helper,
+    Uri fileUri,
   ) {
-    _builder.addInitializer(
+    return _builder.addInitializer(
+      compilerContext,
+      problemReporting,
       inferenceResult.initializer,
-      helper,
       inferenceResult: inferenceResult,
       parent: _member,
+      fileUri: fileUri,
     );
   }