| Index: tests/compiler/dart2js/simple_inferrer_and_or_test.dart
|
| diff --git a/tests/compiler/dart2js/simple_inferrer_and_or_test.dart b/tests/compiler/dart2js/simple_inferrer_and_or_test.dart
|
| index e5a11bce438ef70af9cc3d70bb756fe65fe98526..ac2e682a613ccd7a1cda432db1590c8079cc434a 100644
|
| --- a/tests/compiler/dart2js/simple_inferrer_and_or_test.dart
|
| +++ b/tests/compiler/dart2js/simple_inferrer_and_or_test.dart
|
| @@ -92,32 +92,36 @@ main() {
|
| }
|
| """;
|
|
|
| -
|
| void main() {
|
| Uri uri = new Uri(scheme: 'source');
|
| var compiler = compilerFor(TEST, uri);
|
| asyncTest(() => compiler.run(uri).then((_) {
|
| - var typesInferrer = compiler.globalInference.typesInferrer;
|
| -
|
| - checkReturn(String name, type) {
|
| - var element = findElement(compiler, name);
|
| - Expect.equals(type,
|
| - simplify(typesInferrer.getReturnTypeOfElement(element), compiler));
|
| - }
|
| -
|
| - var subclassOfInterceptor =
|
| - findTypeMask(compiler, 'Interceptor', 'nonNullSubclass');
|
| -
|
| - checkReturn('returnDyn1', subclassOfInterceptor);
|
| - checkReturn('returnDyn2', subclassOfInterceptor);
|
| - checkReturn('returnDyn3', subclassOfInterceptor);
|
| - checkReturn('returnDyn4', compiler.commonMasks.dynamicType.nonNullable());
|
| - checkReturn('returnDyn5', compiler.commonMasks.dynamicType.nonNullable());
|
| - checkReturn('returnDyn6', compiler.commonMasks.dynamicType.nonNullable());
|
| - checkReturn('returnDyn7', subclassOfInterceptor);
|
| - checkReturn('returnDyn7b', subclassOfInterceptor);
|
| - checkReturn('returnDyn8', subclassOfInterceptor);
|
| - checkReturn('returnDyn9', subclassOfInterceptor);
|
| - checkReturn('returnString', compiler.commonMasks.stringType);
|
| - }));
|
| + var typesInferrer = compiler.globalInference.typesInferrer;
|
| +
|
| + checkReturn(String name, type) {
|
| + var element = findElement(compiler, name);
|
| + Expect.equals(
|
| + type,
|
| + simplify(
|
| + typesInferrer.getReturnTypeOfElement(element), compiler));
|
| + }
|
| +
|
| + var subclassOfInterceptor =
|
| + findTypeMask(compiler, 'Interceptor', 'nonNullSubclass');
|
| +
|
| + checkReturn('returnDyn1', subclassOfInterceptor);
|
| + checkReturn('returnDyn2', subclassOfInterceptor);
|
| + checkReturn('returnDyn3', subclassOfInterceptor);
|
| + checkReturn(
|
| + 'returnDyn4', compiler.commonMasks.dynamicType.nonNullable());
|
| + checkReturn(
|
| + 'returnDyn5', compiler.commonMasks.dynamicType.nonNullable());
|
| + checkReturn(
|
| + 'returnDyn6', compiler.commonMasks.dynamicType.nonNullable());
|
| + checkReturn('returnDyn7', subclassOfInterceptor);
|
| + checkReturn('returnDyn7b', subclassOfInterceptor);
|
| + checkReturn('returnDyn8', subclassOfInterceptor);
|
| + checkReturn('returnDyn9', subclassOfInterceptor);
|
| + checkReturn('returnString', compiler.commonMasks.stringType);
|
| + }));
|
| }
|
|
|