| Index: tests/compiler/dart2js/expect_annotations_test.dart
|
| diff --git a/tests/compiler/dart2js/expect_annotations_test.dart b/tests/compiler/dart2js/expect_annotations_test.dart
|
| index 7c4605a464af943bfba075f96c8f3285e797d22b..8e2abcdccfd376bf73fb427ffae9e42772e4b062 100644
|
| --- a/tests/compiler/dart2js/expect_annotations_test.dart
|
| +++ b/tests/compiler/dart2js/expect_annotations_test.dart
|
| @@ -94,17 +94,18 @@ main() {
|
| expectAssumeDynamic,
|
| backend.annotations.assumeDynamic(method),
|
| "Unexpected annotation of @AssumeDynamic on '$method'.");
|
| - TypesInferrer inferrer = compiler.typesTask.typesInferrer;
|
| + TypesInferrer inferrer = compiler.globalInference.typesInferrer;
|
| if (expectTrustTypeAnnotations && expectedParameterType != null) {
|
| testTypeMatch(method, expectedParameterType, expectedReturnType,
|
| inferrer);
|
| } else if (expectAssumeDynamic) {
|
| - testTypeMatch(method, compiler.typesTask.dynamicType, null, inferrer);
|
| + testTypeMatch(method,
|
| + compiler.commonMasks.dynamicType, null, inferrer);
|
| }
|
| }
|
|
|
| - TypeMask jsStringType = compiler.typesTask.stringType;
|
| - TypeMask jsIntType = compiler.typesTask.intType;
|
| + TypeMask jsStringType = compiler.commonMasks.stringType;
|
| + TypeMask jsIntType = compiler.commonMasks.intType;
|
| TypeMask coreStringType = new TypeMask.subtype(
|
| compiler.coreClasses.stringClass, compiler.world);
|
|
|
|
|