| OLD | NEW |
| 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, 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 // Test that elements are not needlessly required by dart2js. | 5 // Test that elements are not needlessly required by dart2js. |
| 6 | 6 |
| 7 import 'package:async_helper/async_helper.dart'; | 7 import 'package:async_helper/async_helper.dart'; |
| 8 import 'package:compiler/src/compiler.dart'; | 8 import 'package:compiler/src/compiler.dart'; |
| 9 import 'package:compiler/src/elements/elements.dart'; | 9 import 'package:compiler/src/elements/elements.dart'; |
| 10 import 'package:compiler/src/enqueue.dart'; | 10 import 'package:compiler/src/enqueue.dart'; |
| 11 import 'package:compiler/src/js_backend/backend_helpers.dart'; | 11 import 'package:compiler/src/js_backend/backend_helpers.dart'; |
| 12 import 'package:expect/expect.dart'; | 12 import 'package:expect/expect.dart'; |
| 13 import 'memory_compiler.dart'; | 13 import 'memory_compiler.dart'; |
| 14 | 14 |
| 15 main() { | 15 main() { |
| 16 asyncTest(() async { | 16 asyncTest(() async { |
| 17 await analyze('main() {}'); | 17 await analyze('main() {}'); |
| 18 await analyze('main() => proxy;', proxyConstant: true); | 18 await analyze('main() => proxy;', proxyConstantComputed: true); |
| 19 await analyze('@deprecated main() {}'); | 19 await analyze('@deprecated main() {}'); |
| 20 await analyze('@deprecated main() => deprecated;', deprecatedClass: true); | 20 await analyze('@deprecated main() => deprecated;', deprecatedClass: true); |
| 21 await analyze('main() => deprecated;', deprecatedClass: true); | 21 await analyze('main() => deprecated;', deprecatedClass: true); |
| 22 }); | 22 }); |
| 23 } | 23 } |
| 24 | 24 |
| 25 void checkInstantiated(Compiler compiler, ClassElement cls, bool expected) { | 25 void checkInstantiated(Compiler compiler, ClassElement cls, bool expected) { |
| 26 ResolutionEnqueuer enqueuer = compiler.enqueuer.resolution; | 26 ResolutionEnqueuer enqueuer = compiler.enqueuer.resolution; |
| 27 bool isInstantiated = | 27 bool isInstantiated = |
| 28 enqueuer.universe.directlyInstantiatedClasses.contains(cls); | 28 enqueuer.universe.directlyInstantiatedClasses.contains(cls); |
| 29 bool isProcessed = enqueuer.isClassProcessed(cls); | 29 bool isProcessed = enqueuer.isClassProcessed(cls); |
| 30 Expect.equals(expected, isInstantiated, | 30 Expect.equals(expected, isInstantiated, |
| 31 'Unexpected instantiation state of class $cls.'); | 31 'Unexpected instantiation state of class $cls.'); |
| 32 Expect.equals( | 32 Expect.equals( |
| 33 expected, isProcessed, 'Unexpected processing state of class $cls.'); | 33 expected, isProcessed, 'Unexpected processing state of class $cls.'); |
| 34 } | 34 } |
| 35 | 35 |
| 36 analyze(String code, | 36 analyze(String code, |
| 37 {bool proxyConstant: false, bool deprecatedClass: false}) async { | 37 {bool proxyConstantComputed: false, bool deprecatedClass: false}) async { |
| 38 CompilationResult result = await runCompiler( | 38 CompilationResult result = await runCompiler( |
| 39 memorySourceFiles: {'main.dart': code}, options: ['--analyze-only']); | 39 memorySourceFiles: {'main.dart': code}, options: ['--analyze-only']); |
| 40 Expect.isTrue(result.isSuccess); | 40 Expect.isTrue(result.isSuccess); |
| 41 Compiler compiler = result.compiler; | 41 Compiler compiler = result.compiler; |
| 42 Expect.equals(proxyConstant, compiler.resolution.proxyConstant != null, | 42 Expect.equals(proxyConstantComputed, |
| 43 compiler.resolution.wasProxyConstantComputedTestingOnly, |
| 43 "Unexpected computation of proxy constant."); | 44 "Unexpected computation of proxy constant."); |
| 44 | 45 |
| 45 checkInstantiated( | 46 checkInstantiated( |
| 46 compiler, compiler.coreLibrary.find('_Proxy'), proxyConstant); | 47 compiler, compiler.commonElements.coreLibrary.find('_Proxy'), |
| 48 proxyConstantComputed); |
| 47 checkInstantiated( | 49 checkInstantiated( |
| 48 compiler, compiler.coreLibrary.find('Deprecated'), deprecatedClass); | 50 compiler, compiler.commonElements.coreLibrary.find('Deprecated'), |
| 51 deprecatedClass); |
| 49 | 52 |
| 50 LibraryElement jsHelperLibrary = | 53 LibraryElement jsHelperLibrary = |
| 51 compiler.libraryLoader.lookupLibrary(BackendHelpers.DART_JS_HELPER); | 54 compiler.libraryLoader.lookupLibrary(BackendHelpers.DART_JS_HELPER); |
| 52 jsHelperLibrary.forEachLocalMember((Element element) { | 55 jsHelperLibrary.forEachLocalMember((Element element) { |
| 53 Uri uri = element.compilationUnit.script.resourceUri; | 56 Uri uri = element.compilationUnit.script.resourceUri; |
| 54 if (element.isClass && uri.path.endsWith('annotations.dart')) { | 57 if (element.isClass && uri.path.endsWith('annotations.dart')) { |
| 55 checkInstantiated(compiler, element, false); | 58 checkInstantiated(compiler, element, false); |
| 56 } | 59 } |
| 57 }); | 60 }); |
| 58 } | 61 } |
| OLD | NEW |