commit 54d1118a667e2f394e0612d006cc0d080677c533
author Peter von der Ahé <ahe@google.com> Mon Dec 17 14:33:49 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Mon Dec 17 14:33:49 2018 +0000
tree 73727a3ebbbf08c24b1f2673e30c8f3183e1b987
parent 8dea395b18d32ed29d51282ad20f41b6756fc3ff

Remove Loader.typeInferenceEngine

Change-Id: I5ecbb3308436bc7ecee98ea7b15a1ec669a5c621
Reviewed-on: https://dart-review.googlesource.com/c/86344
Reviewed-by: Dmitry Stefantsov <dmitryas@google.com>
Commit-Queue: Peter von der Ahé <ahe@google.com>

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

diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart
index 4d1aa3b..7b0bc69 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart
@@ -22,8 +22,8 @@
     show
         Declaration,
         FieldBuilder,
+        KernelLibraryBuilder,
         KernelTypeBuilder,
-        LibraryBuilder,
         MetadataBuilder;
 
 import 'kernel_shadow_ast.dart' show ShadowField;
@@ -61,7 +61,7 @@
         (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 @@
 
   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

diff --git a/pkg/front_end/lib/src/fasta/loader.dart b/pkg/front_end/lib/src/fasta/loader.dart
index 1dcea9d..8823bfa 100644
--- a/pkg/front_end/lib/src/fasta/loader.dart
+++ b/pkg/front_end/lib/src/fasta/loader.dart
@@ -33,8 +33,6 @@
 
 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 @@
 
   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

diff --git a/pkg/front_end/lib/src/fasta/source/source_loader.dart b/pkg/front_end/lib/src/fasta/source/source_loader.dart
index 35aade6..db24c5f 100644
--- a/pkg/front_end/lib/src/fasta/source/source_loader.dart
+++ b/pkg/front_end/lib/src/fasta/source/source_loader.dart
@@ -102,8 +102,6 @@
 
 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 @@
   DartType iterableOfBottom;
   DartType streamOfBottom;
 
-  @override
-  TypeInferenceEngine typeInferenceEngine;
+  ShadowTypeInferenceEngine typeInferenceEngine;
 
   InterfaceResolver interfaceResolver;