Rename TypeInferenceEngine.strongMode to legacyMode
Change-Id: Ie1df26dafd9f2dbbe582c7348c3e35028423049d
Reviewed-on: https://dart-review.googlesource.com/c/84402
Auto-Submit: Peter von der Ahé <ahe@google.com>
Commit-Queue: Jens Johansen <jensj@google.com>
Reviewed-by: Jens Johansen <jensj@google.com>
diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart
index 259cf74..2ebf9d8 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart
@@ -1558,8 +1558,8 @@
/// Concrete implementation of [TypeInferenceEngine] specialized to work with
/// kernel objects.
class ShadowTypeInferenceEngine extends TypeInferenceEngine {
- ShadowTypeInferenceEngine(Instrumentation instrumentation, bool strongMode)
- : super(instrumentation, strongMode);
+ ShadowTypeInferenceEngine(Instrumentation instrumentation, bool legacyMode)
+ : super(instrumentation, legacyMode);
@override
TypeInferrer createDisabledTypeInferrer() =>
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 06db134..ea542e0 100644
--- a/pkg/front_end/lib/src/fasta/source/source_loader.dart
+++ b/pkg/front_end/lib/src/fasta/source/source_loader.dart
@@ -912,7 +912,7 @@
void createTypeInferenceEngine() {
typeInferenceEngine =
- new ShadowTypeInferenceEngine(instrumentation, !target.legacyMode);
+ new ShadowTypeInferenceEngine(instrumentation, target.legacyMode);
}
void performTopLevelInference(List<SourceClassBuilder> sourceClasses) {
diff --git a/pkg/front_end/lib/src/fasta/type_inference/type_inference_engine.dart b/pkg/front_end/lib/src/fasta/type_inference/type_inference_engine.dart
index c5ebbb1..65faeb5 100644
--- a/pkg/front_end/lib/src/fasta/type_inference/type_inference_engine.dart
+++ b/pkg/front_end/lib/src/fasta/type_inference/type_inference_engine.dart
@@ -48,7 +48,7 @@
@override
void resolveInternal() {
- if (_typeInferenceEngine.strongMode) {
+ if (!_typeInferenceEngine.legacyMode) {
var typeInferrer = _typeInferenceEngine.getFieldTypeInferrer(field);
// Note: in the event that there is erroneous code, it's possible for
// typeInferrer to be null. If this happens, just skip type inference for
@@ -227,9 +227,9 @@
final Instrumentation instrumentation;
- final bool strongMode;
+ final bool legacyMode;
- TypeInferenceEngine(this.instrumentation, this.strongMode);
+ TypeInferenceEngine(this.instrumentation, this.legacyMode);
/// Creates a disabled type inferrer (intended for debugging and profiling
/// only).
@@ -300,7 +300,7 @@
this.coreTypes = coreTypes;
this.classHierarchy = hierarchy;
this.typeSchemaEnvironment =
- new TypeSchemaEnvironment(coreTypes, hierarchy, strongMode);
+ new TypeSchemaEnvironment(coreTypes, hierarchy, !legacyMode);
}
/// Records that the given static [field] will need top level type inference.
diff --git a/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart b/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart
index c11d8b5..15b9e10 100644
--- a/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart
+++ b/pkg/front_end/lib/src/fasta/type_inference/type_inferrer.dart
@@ -592,7 +592,7 @@
TypeInferrerImpl.private(
this.engine, this.uri, bool topLevel, this.thisType, this.library)
- : strongMode = engine.strongMode,
+ : strongMode = !engine.legacyMode,
classHierarchy = engine.classHierarchy,
instrumentation = topLevel ? null : engine.instrumentation,
typeSchemaEnvironment = engine.typeSchemaEnvironment,
