| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 import 'package:expect/expect.dart'; | 5 import 'package:expect/expect.dart'; |
| 6 import "package:async_helper/async_helper.dart"; | 6 import "package:async_helper/async_helper.dart"; |
| 7 import 'package:compiler/src/types/types.dart' show TypeMask; | 7 import 'package:compiler/src/types/types.dart' show TypeMask; |
| 8 import 'type_mask_test_helper.dart'; | 8 import 'type_mask_test_helper.dart'; |
| 9 | 9 |
| 10 import 'compiler_helper.dart'; | 10 import 'compiler_helper.dart'; |
| (...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 720 testReturnNull6(); | 720 testReturnNull6(); |
| 721 testReturnNotEquals(); | 721 testReturnNotEquals(); |
| 722 } | 722 } |
| 723 """; | 723 """; |
| 724 | 724 |
| 725 void main() { | 725 void main() { |
| 726 Uri uri = new Uri(scheme: 'source'); | 726 Uri uri = new Uri(scheme: 'source'); |
| 727 var compiler = compilerFor(TEST, uri); | 727 var compiler = compilerFor(TEST, uri); |
| 728 compiler.diagnosticHandler = createHandler(compiler, TEST); | 728 compiler.diagnosticHandler = createHandler(compiler, TEST); |
| 729 asyncTest(() => compiler.run(uri).then((_) { | 729 asyncTest(() => compiler.run(uri).then((_) { |
| 730 var commonMasks = compiler.commonMasks; | 730 var commonMasks = compiler.closedWorld.commonMasks; |
| 731 var typesInferrer = compiler.globalInference.typesInferrer; | 731 var typesInferrer = compiler.globalInference.typesInferrerInternal; |
| 732 var world = compiler.closedWorld; | 732 var world = compiler.closedWorld; |
| 733 | 733 |
| 734 checkReturn(String name, type) { | 734 checkReturn(String name, type) { |
| 735 var element = findElement(compiler, name); | 735 var element = findElement(compiler, name); |
| 736 Expect.equals( | 736 Expect.equals( |
| 737 type, | 737 type, |
| 738 simplify(typesInferrer.getReturnTypeOfElement(element), compiler), | 738 simplify(typesInferrer.getReturnTypeOfElement(element), compiler), |
| 739 name); | 739 name); |
| 740 } | 740 } |
| 741 | 741 |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 880 checkReturn('testSpecialization3', commonMasks.uint31Type.nullable()); | 880 checkReturn('testSpecialization3', commonMasks.uint31Type.nullable()); |
| 881 checkReturn('testReturnNull1', commonMasks.nullType); | 881 checkReturn('testReturnNull1', commonMasks.nullType); |
| 882 checkReturn('testReturnNull2', commonMasks.nullType); | 882 checkReturn('testReturnNull2', commonMasks.nullType); |
| 883 checkReturn('testReturnNull3', commonMasks.dynamicType); | 883 checkReturn('testReturnNull3', commonMasks.dynamicType); |
| 884 checkReturn('testReturnNull4', commonMasks.nullType); | 884 checkReturn('testReturnNull4', commonMasks.nullType); |
| 885 checkReturn('testReturnNull5', commonMasks.nullType); | 885 checkReturn('testReturnNull5', commonMasks.nullType); |
| 886 checkReturn('testReturnNull6', commonMasks.dynamicType); | 886 checkReturn('testReturnNull6', commonMasks.dynamicType); |
| 887 checkReturn('testReturnNotEquals', commonMasks.boolType); | 887 checkReturn('testReturnNotEquals', commonMasks.boolType); |
| 888 })); | 888 })); |
| 889 } | 889 } |
| OLD | NEW |