| Index: tests/compiler/dart2js/type_inference_switch_test.dart
|
| diff --git a/tests/compiler/dart2js/type_inference_switch_test.dart b/tests/compiler/dart2js/type_inference_switch_test.dart
|
| index 181fc4156e5b8d99391848432aa28fc3b828d351..f28444bd21e2737f7328269ff5be35779222d5a5 100644
|
| --- a/tests/compiler/dart2js/type_inference_switch_test.dart
|
| +++ b/tests/compiler/dart2js/type_inference_switch_test.dart
|
| @@ -133,17 +133,18 @@ main() {
|
| Future runTest(String test, checker) {
|
| Uri uri = new Uri(scheme: 'source');
|
| var compiler = compilerFor(test, uri);
|
| -
|
| - checkTypeOf(String name, TypeMask type) {
|
| - var commonMasks = compiler.closedWorld.commonMasks;
|
| + return compiler.run(uri).then((_) {
|
| var typesInferrer = compiler.globalInference.typesInferrerInternal;
|
| - var element = findElement(compiler, name);
|
| - var mask = typesInferrer.getReturnTypeOfElement(element);
|
| - Expect.equals(type, simplify(mask, compiler));
|
| - }
|
| + var closedWorld = typesInferrer.closedWorld;
|
| + var commonMasks = closedWorld.commonMasks;
|
|
|
| - return compiler.run(uri).then((_) {
|
| - checker(compiler.closedWorld.commonMasks, checkTypeOf);
|
| + checkTypeOf(String name, TypeMask type) {
|
| + var element = findElement(compiler, name);
|
| + var mask = typesInferrer.getReturnTypeOfElement(element);
|
| + Expect.equals(type, simplify(mask, closedWorld));
|
| + }
|
| +
|
| + checker(commonMasks, checkTypeOf);
|
| });
|
| }
|
|
|
|
|