Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(355)

Unified Diff: tests/compiler/dart2js/map_tracer_test.dart

Issue 2577423002: Further reduce use of Compiler.closedWorld. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tests/compiler/dart2js/map_tracer_test.dart
diff --git a/tests/compiler/dart2js/map_tracer_test.dart b/tests/compiler/dart2js/map_tracer_test.dart
index 0bd52891b454d41e11a5b30ce8c33c7c212ed8f2..bab5e224a718d646aa8494b9e9f8723c562dceac 100644
--- a/tests/compiler/dart2js/map_tracer_test.dart
+++ b/tests/compiler/dart2js/map_tracer_test.dart
@@ -212,11 +212,11 @@ void doTest(String allocation, [String keyElement, String valueElement]) {
var compiler = compilerFor(generateTest(allocation), uri,
expectedErrors: 0, expectedWarnings: 1);
compiler.closeResolution();
- var closedWorld = compiler.closedWorld;
asyncTest(() => compiler.run(uri).then((_) {
var keyType, valueType;
- var commonMasks = compiler.closedWorld.commonMasks;
var typesInferrer = compiler.globalInference.typesInferrerInternal;
+ var closedWorld = typesInferrer.closedWorld;
+ var commonMasks = closedWorld.commonMasks;
var emptyType = new TypeMask.nonNullEmpty();
var aKeyType =
typesInferrer.getTypeOfElement(findElement(compiler, 'aKey'));
@@ -234,14 +234,15 @@ void doTest(String allocation, [String keyElement, String valueElement]) {
checkType(String name, keyType, valueType) {
var element = findElement(compiler, name);
MapTypeMask mask = typesInferrer.getTypeOfElement(element);
- Expect.equals(keyType, simplify(mask.keyType, compiler), name);
- Expect.equals(valueType, simplify(mask.valueType, compiler), name);
+ Expect.equals(keyType, simplify(mask.keyType, closedWorld), name);
+ Expect.equals(valueType, simplify(mask.valueType, closedWorld), name);
}
K(TypeMask other) =>
- simplify(keyType.union(other, closedWorld), compiler);
+ simplify(keyType.union(other, closedWorld), closedWorld);
V(TypeMask other) =>
- simplify(valueType.union(other, closedWorld), compiler).nullable();
+ simplify(valueType.union(other, closedWorld), closedWorld)
+ .nullable();
checkType('mapInField', K(aKeyType), V(commonMasks.numType));
checkType('mapPassedToMethod', K(aKeyType), V(commonMasks.numType));
« no previous file with comments | « tests/compiler/dart2js/map_tracer_keys_test.dart ('k') | tests/compiler/dart2js/mirror_final_field_inferrer2_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698