Rename strongMode constructor parameter of TypeSchemaEnvironment to legacyMode
Change-Id: I713dcf4a2f614893832fb4d18dcaa23c67ffd9c5
Reviewed-on: https://dart-review.googlesource.com/c/84409
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/dev_compiler/lib/src/kernel/compiler.dart b/pkg/dev_compiler/lib/src/kernel/compiler.dart
index 90750b8..3dbe8bd 100644
--- a/pkg/dev_compiler/lib/src/kernel/compiler.dart
+++ b/pkg/dev_compiler/lib/src/kernel/compiler.dart
@@ -198,7 +198,7 @@
factory ProgramCompiler(Component component, ClassHierarchy hierarchy,
SharedCompilerOptions options, Map<String, String> declaredVariables) {
var coreTypes = CoreTypes(component);
- var types = TypeSchemaEnvironment(coreTypes, hierarchy, true);
+ var types = TypeSchemaEnvironment(coreTypes, hierarchy, false);
var constants = DevCompilerConstants(types, declaredVariables);
var nativeTypes = NativeTypeSet(coreTypes, constants);
var jsTypeRep = JSTypeRep(types);
diff --git a/pkg/dev_compiler/test/nullable_inference_test.dart b/pkg/dev_compiler/test/nullable_inference_test.dart
index f096c90..3a1c819 100644
--- a/pkg/dev_compiler/test/nullable_inference_test.dart
+++ b/pkg/dev_compiler/test/nullable_inference_test.dart
@@ -488,7 +488,7 @@
@override
visitComponent(Component node) {
inference ??= NullableInference(JSTypeRep(
- fe.TypeSchemaEnvironment(CoreTypes(node), ClassHierarchy(node), true),
+ fe.TypeSchemaEnvironment(CoreTypes(node), ClassHierarchy(node), false),
));
if (useAnnotations) {
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 65faeb5..fda2de0 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
@@ -300,7 +300,7 @@
this.coreTypes = coreTypes;
this.classHierarchy = hierarchy;
this.typeSchemaEnvironment =
- new TypeSchemaEnvironment(coreTypes, hierarchy, !legacyMode);
+ 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 e9afa48..3fa4df8 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
@@ -2105,7 +2105,7 @@
Class mixinClass = mixedInType.classNode;
Supertype mixinSupertype = mixinClass.supertype;
gatherer = new TypeConstraintGatherer(
- new TypeSchemaEnvironment(loader.coreTypes, hierarchy, true),
+ new TypeSchemaEnvironment(loader.coreTypes, hierarchy, false),
mixinClass.typeParameters);
// Generate constraints based on the mixin's supertype.
generateConstraints(hierarchy, mixinClass, baseType, mixinSupertype);
diff --git a/pkg/front_end/lib/src/fasta/type_inference/type_schema_environment.dart b/pkg/front_end/lib/src/fasta/type_inference/type_schema_environment.dart
index d08ecec..507e085 100644
--- a/pkg/front_end/lib/src/fasta/type_inference/type_schema_environment.dart
+++ b/pkg/front_end/lib/src/fasta/type_inference/type_schema_environment.dart
@@ -91,8 +91,8 @@
class TypeSchemaEnvironment extends TypeEnvironment {
TypeSchemaEnvironment(
- CoreTypes coreTypes, ClassHierarchy hierarchy, bool strongMode)
- : super(coreTypes, hierarchy, strongMode: strongMode);
+ CoreTypes coreTypes, ClassHierarchy hierarchy, bool legacyMode)
+ : super(coreTypes, hierarchy, strongMode: !legacyMode);
/// Modify the given [constraint]'s lower bound to include [lower].
void addLowerBound(TypeConstraint constraint, DartType lower) {
diff --git a/pkg/front_end/test/fasta/type_inference/interface_resolver_test.dart b/pkg/front_end/test/fasta/type_inference/interface_resolver_test.dart
index cca3905..6389bc7 100644
--- a/pkg/front_end/test/fasta/type_inference/interface_resolver_test.dart
+++ b/pkg/front_end/test/fasta/type_inference/interface_resolver_test.dart
@@ -47,7 +47,7 @@
TypeSchemaEnvironment get typeEnvironment {
return cachedTypeEnvironment ??=
- new TypeSchemaEnvironment(coreTypes, classHierarchy, true);
+ new TypeSchemaEnvironment(coreTypes, classHierarchy, false);
}
InterfaceResolver get interfaceResolver {
diff --git a/pkg/front_end/test/fasta/type_inference/type_constraint_gatherer_test.dart b/pkg/front_end/test/fasta/type_inference/type_constraint_gatherer_test.dart
index dddce21..3df1a9e 100644
--- a/pkg/front_end/test/fasta/type_inference/type_constraint_gatherer_test.dart
+++ b/pkg/front_end/test/fasta/type_inference/type_constraint_gatherer_test.dart
@@ -210,7 +210,7 @@
void _checkConstraints(
DartType a, DartType b, List<String> expectedConstraints) {
var typeSchemaEnvironment = new TypeSchemaEnvironment(
- coreTypes, new ClassHierarchy(component), true);
+ coreTypes, new ClassHierarchy(component), false);
var typeConstraintGatherer = new TypeConstraintGatherer(
typeSchemaEnvironment, [T1.parameter, T2.parameter]);
var constraints = typeConstraintGatherer.trySubtypeMatch(a, b)
diff --git a/pkg/front_end/test/fasta/type_inference/type_schema_environment_test.dart b/pkg/front_end/test/fasta/type_inference/type_schema_environment_test.dart
index cddd384..86e1564 100644
--- a/pkg/front_end/test/fasta/type_inference/type_schema_environment_test.dart
+++ b/pkg/front_end/test/fasta/type_inference/type_schema_environment_test.dart
@@ -715,7 +715,7 @@
TypeSchemaEnvironment _makeEnv() {
return new TypeSchemaEnvironment(
- coreTypes, new ClassHierarchy(component), true);
+ coreTypes, new ClassHierarchy(component), false);
}
DartType _map(DartType key, DartType value) =>
