| Index: tests/compiler/dart2js/closure_tracer_test.dart
|
| diff --git a/tests/compiler/dart2js/closure_tracer_test.dart b/tests/compiler/dart2js/closure_tracer_test.dart
|
| index 86d1e2fcd8f07aec7e051812c34124d4e0ac9674..f8718e46b71f2e9b5066b03adcd81645f7084cf3 100644
|
| --- a/tests/compiler/dart2js/closure_tracer_test.dart
|
| +++ b/tests/compiler/dart2js/closure_tracer_test.dart
|
| @@ -154,8 +154,8 @@ void main() {
|
| Uri uri = new Uri(scheme: 'source');
|
| var compiler = compilerFor(TEST, uri);
|
| asyncTest(() => compiler.run(uri).then((_) {
|
| - var typesTask = compiler.typesTask;
|
| - var typesInferrer = typesTask.typesInferrer;
|
| + var commonMasks = compiler.commonMasks;
|
| + var typesInferrer = compiler.globalInference.typesInferrer;
|
|
|
| checkType(String name, type) {
|
| var element = findElement(compiler, name);
|
| @@ -163,18 +163,18 @@ void main() {
|
| Expect.equals(type.nullable(), simplify(mask, compiler), name);
|
| }
|
|
|
| - checkType('testFunctionStatement', typesTask.uint31Type);
|
| - checkType('testFunctionExpression', typesTask.uint31Type);
|
| - checkType('testStoredInInstance', typesTask.uint31Type);
|
| - checkType('testStoredInStatic', typesTask.uint31Type);
|
| - checkType('testStoredInMapOfList', typesTask.uint31Type);
|
| - checkType('testStoredInListOfList', typesTask.uint31Type);
|
| - checkType('testStoredInListOfListUsingInsert', typesTask.uint31Type);
|
| - checkType('testStoredInListOfListUsingAdd', typesTask.uint31Type);
|
| - checkType('testPassedInParameter', typesTask.uint31Type);
|
| - checkType('testStaticClosure1', typesTask.uint31Type);
|
| - checkType('testStaticClosure2', typesTask.numType);
|
| - checkType('testStaticClosure3', typesTask.uint31Type);
|
| - checkType('testStaticClosure4', typesTask.numType);
|
| + checkType('testFunctionStatement', commonMasks.uint31Type);
|
| + checkType('testFunctionExpression', commonMasks.uint31Type);
|
| + checkType('testStoredInInstance', commonMasks.uint31Type);
|
| + checkType('testStoredInStatic', commonMasks.uint31Type);
|
| + checkType('testStoredInMapOfList', commonMasks.uint31Type);
|
| + checkType('testStoredInListOfList', commonMasks.uint31Type);
|
| + checkType('testStoredInListOfListUsingInsert', commonMasks.uint31Type);
|
| + checkType('testStoredInListOfListUsingAdd', commonMasks.uint31Type);
|
| + checkType('testPassedInParameter', commonMasks.uint31Type);
|
| + checkType('testStaticClosure1', commonMasks.uint31Type);
|
| + checkType('testStaticClosure2', commonMasks.numType);
|
| + checkType('testStaticClosure3', commonMasks.uint31Type);
|
| + checkType('testStaticClosure4', commonMasks.numType);
|
| }));
|
| }
|
|
|