| Index: tests/compiler/dart2js/list_tracer_test.dart
|
| diff --git a/tests/compiler/dart2js/list_tracer_test.dart b/tests/compiler/dart2js/list_tracer_test.dart
|
| index 24d7ae0bc106def700e068c274195216f7694446..cff8c882ed07a0e5c14997094ed8e7bc83099fd7 100644
|
| --- a/tests/compiler/dart2js/list_tracer_test.dart
|
| +++ b/tests/compiler/dart2js/list_tracer_test.dart
|
| @@ -199,8 +199,8 @@ void doTest(String allocation, {bool nullify}) {
|
| var compiler = compilerFor(generateTest(allocation), uri,
|
| expectedErrors: 0, expectedWarnings: 1);
|
| 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);
|
| @@ -209,31 +209,31 @@ void doTest(String allocation, {bool nullify}) {
|
| Expect.equals(type, simplify(mask.elementType, compiler), name);
|
| }
|
|
|
| - checkType('listInField', typesTask.numType);
|
| - checkType('listPassedToMethod', typesTask.numType);
|
| - checkType('listReturnedFromMethod', typesTask.numType);
|
| - checkType('listUsedWithCascade', typesTask.numType);
|
| - checkType('listUsedInClosure', typesTask.numType);
|
| - checkType('listPassedToSelector', typesTask.numType);
|
| - checkType('listReturnedFromSelector', typesTask.numType);
|
| - checkType('listUsedWithAddAndInsert', typesTask.numType);
|
| - checkType('listUsedWithConstraint', typesTask.positiveIntType);
|
| - checkType('listEscapingFromSetter', typesTask.numType);
|
| - checkType('listUsedInLocal', typesTask.numType);
|
| - checkType('listEscapingInSetterValue', typesTask.numType);
|
| - checkType('listEscapingInIndex', typesTask.numType);
|
| - checkType('listEscapingInIndexSet', typesTask.uint31Type);
|
| - checkType('listEscapingTwiceInIndexSet', typesTask.numType);
|
| - checkType('listSetInNonFinalField', typesTask.numType);
|
| - checkType('listWithChangedLength', typesTask.uint31Type.nullable());
|
| -
|
| - checkType('listPassedToClosure', typesTask.dynamicType);
|
| - checkType('listReturnedFromClosure', typesTask.dynamicType);
|
| - checkType('listUsedWithNonOkSelector', typesTask.dynamicType);
|
| - checkType('listPassedAsOptionalParameter', typesTask.numType);
|
| - checkType('listPassedAsNamedParameter', typesTask.numType);
|
| - checkType('listStoredInList', typesTask.uint31Type);
|
| - checkType('listStoredInListButEscapes', typesTask.dynamicType);
|
| + checkType('listInField', commonMasks.numType);
|
| + checkType('listPassedToMethod', commonMasks.numType);
|
| + checkType('listReturnedFromMethod', commonMasks.numType);
|
| + checkType('listUsedWithCascade', commonMasks.numType);
|
| + checkType('listUsedInClosure', commonMasks.numType);
|
| + checkType('listPassedToSelector', commonMasks.numType);
|
| + checkType('listReturnedFromSelector', commonMasks.numType);
|
| + checkType('listUsedWithAddAndInsert', commonMasks.numType);
|
| + checkType('listUsedWithConstraint', commonMasks.positiveIntType);
|
| + checkType('listEscapingFromSetter', commonMasks.numType);
|
| + checkType('listUsedInLocal', commonMasks.numType);
|
| + checkType('listEscapingInSetterValue', commonMasks.numType);
|
| + checkType('listEscapingInIndex', commonMasks.numType);
|
| + checkType('listEscapingInIndexSet', commonMasks.uint31Type);
|
| + checkType('listEscapingTwiceInIndexSet', commonMasks.numType);
|
| + checkType('listSetInNonFinalField', commonMasks.numType);
|
| + checkType('listWithChangedLength', commonMasks.uint31Type.nullable());
|
| +
|
| + checkType('listPassedToClosure', commonMasks.dynamicType);
|
| + checkType('listReturnedFromClosure', commonMasks.dynamicType);
|
| + checkType('listUsedWithNonOkSelector', commonMasks.dynamicType);
|
| + checkType('listPassedAsOptionalParameter', commonMasks.numType);
|
| + checkType('listPassedAsNamedParameter', commonMasks.numType);
|
| + checkType('listStoredInList', commonMasks.uint31Type);
|
| + checkType('listStoredInListButEscapes', commonMasks.dynamicType);
|
|
|
| if (!allocation.contains('filled')) {
|
| checkType('listUnset', new TypeMask.nonNullEmpty());
|
|
|