Remove Loader.typeInferenceEngine

Change-Id: I5ecbb3308436bc7ecee98ea7b15a1ec669a5c621
Reviewed-on: https://dart-review.googlesource.com/c/86344
Reviewed-by: Dmitry Stefantsov <[email protected]>
Commit-Queue: Peter von der Ahé <[email protected]>

Author: peter-ahe-google

pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart

@@ -22,8 +22,8 @@ import 'kernel_builder.dart'
     show
         Declaration,
         FieldBuilder,
+        KernelLibraryBuilder,
         KernelTypeBuilder,
-        LibraryBuilder,
         MetadataBuilder;
 
 import 'kernel_shadow_ast.dart' show ShadowField;
@@ -61,7 +61,7 @@ class KernelFieldBuilder extends FieldBuilder<Expression> {
         (hasInitializer || isInstanceMember);
   }
 
-  Field build(LibraryBuilder library) {
+  Field build(KernelLibraryBuilder library) {
     field.name ??= new Name(name, library.target);
     if (type != null) {
       field.type = type.build(library);
@@ -85,6 +85,7 @@ class KernelFieldBuilder extends FieldBuilder<Expression> {
 
   void prepareTopLevelInference() {
     if (!isEligibleForInference) return;
+    KernelLibraryBuilder library = this.library;
     var typeInferrer = library.loader.typeInferenceEngine
         .createTopLevelTypeInferrer(
             field.enclosingClass?.thisType, field, null);

pkg/front_end/lib/src/fasta/loader.dart

@@ -33,8 +33,6 @@ import 'target_implementation.dart' show TargetImplementation;
 
 import 'ticker.dart' show Ticker;
 
-import 'type_inference/type_inference_engine.dart' show TypeInferenceEngine;
-
 const String untranslatableUriScheme = "org-dartlang-untranslatable-uri";
 
 abstract class Loader<L> {
@@ -78,8 +76,6 @@ abstract class Loader<L> {
 
   Template<SummaryTemplate> get outlineSummaryTemplate;
 
-  TypeInferenceEngine get typeInferenceEngine => null;
-
   bool get isSourceLoader => false;
 
   /// Look up a library builder by the name [uri], or if such doesn't

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

@@ -102,8 +102,6 @@ import '../severity.dart' show Severity;
 
 import '../type_inference/interface_resolver.dart' show InterfaceResolver;
 
-import '../type_inference/type_inference_engine.dart' show TypeInferenceEngine;
-
 import '../type_inference/type_inferrer.dart'
     show LegacyModeMixinInferrer, StrongModeMixinInferrer;
 
@@ -134,8 +132,7 @@ class SourceLoader<L> extends Loader<L> {
   DartType iterableOfBottom;
   DartType streamOfBottom;
 
-  @override
-  TypeInferenceEngine typeInferenceEngine;
+  ShadowTypeInferenceEngine typeInferenceEngine;
 
   InterfaceResolver interfaceResolver;