| OLD | NEW |
| 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2016, 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 // Tests that the closed world computed from [WorldImpact]s derived from kernel | 5 // Tests that the closed world computed from [WorldImpact]s derived from kernel |
| 6 // is equivalent to the original computed from resolution. | 6 // is equivalent to the original computed from resolution. |
| 7 library dart2js.kernel.closed_world_test; | 7 library dart2js.kernel.closed_world_test; |
| 8 | 8 |
| 9 import 'package:async_helper/async_helper.dart'; | 9 import 'package:async_helper/async_helper.dart'; |
| 10 import 'package:compiler/src/commandline_options.dart'; | 10 import 'package:compiler/src/commandline_options.dart'; |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 compiler.resolution.retainCachesForTesting = true; | 81 compiler.resolution.retainCachesForTesting = true; |
| 82 await compiler.run(entryPoint); | 82 await compiler.run(entryPoint); |
| 83 compiler.resolutionWorldBuilder.closeWorld(compiler.reporter); | 83 compiler.resolutionWorldBuilder.closeWorld(compiler.reporter); |
| 84 | 84 |
| 85 JavaScriptBackend backend = compiler.backend; | 85 JavaScriptBackend backend = compiler.backend; |
| 86 // Create a new resolution enqueuer and feed it with the [WorldImpact]s | 86 // Create a new resolution enqueuer and feed it with the [WorldImpact]s |
| 87 // computed from kernel through the [build] in `kernel_impact.dart`. | 87 // computed from kernel through the [build] in `kernel_impact.dart`. |
| 88 ResolutionEnqueuer enqueuer = new ResolutionEnqueuer( | 88 ResolutionEnqueuer enqueuer = new ResolutionEnqueuer( |
| 89 compiler.enqueuer, | 89 compiler.enqueuer, |
| 90 compiler.options, | 90 compiler.options, |
| 91 compiler.resolution, | 91 compiler.reporter, |
| 92 const TreeShakingEnqueuerStrategy(), | 92 const TreeShakingEnqueuerStrategy(), |
| 93 compiler.globalDependencies, | 93 compiler.globalDependencies, |
| 94 backend, | 94 backend, |
| 95 backend.nativeResolutionEnqueuer(), |
| 96 new ResolutionWorldBuilderImpl( |
| 97 compiler.backend, compiler.resolution, const OpenWorldStrategy()), |
| 98 new ResolutionWorkItemBuilder(compiler.resolution), |
| 95 'enqueuer from kernel'); | 99 'enqueuer from kernel'); |
| 96 // TODO(johnniwinther): Store backend info separately. This replacement is | 100 ClosedWorld closedWorld = computeClosedWorld(compiler, enqueuer); |
| 97 // made to reset a field in [TypeVariableHandler] that prevents it from | |
| 98 // enqueuing twice. | |
| 99 backend.typeVariableHandler = new TypeVariableHandler(compiler); | |
| 100 | 101 |
| 101 if (compiler.deferredLoadTask.isProgramSplit) { | 102 checkResolutionEnqueuers(compiler.backend, compiler.backend, |
| 102 enqueuer.applyImpact(backend.computeDeferredLoadingImpact()); | 103 compiler.enqueuer.resolution, enqueuer, |
| 103 } | |
| 104 enqueuer.applyImpact(backend.computeHelpersImpact()); | |
| 105 enqueuer.applyImpact(enqueuer.nativeEnqueuer | |
| 106 .processNativeClasses(compiler.libraryLoader.libraries)); | |
| 107 enqueuer.applyImpact( | |
| 108 backend.computeMainImpact(compiler.mainFunction, forResolution: true)); | |
| 109 enqueuer.forEach((work) { | |
| 110 AstElement element = work.element; | |
| 111 ResolutionImpact resolutionImpact = build(compiler, element.resolvedAst); | |
| 112 WorldImpact worldImpact = compiler.backend.impactTransformer | |
| 113 .transformResolutionImpact(enqueuer, resolutionImpact); | |
| 114 enqueuer.applyImpact(worldImpact, impactSource: element); | |
| 115 }); | |
| 116 ClosedWorld closedWorld = | |
| 117 enqueuer.worldBuilder.closeWorld(compiler.reporter); | |
| 118 | |
| 119 checkResolutionEnqueuers(compiler.enqueuer.resolution, enqueuer, | |
| 120 typeEquivalence: (ResolutionDartType a, ResolutionDartType b) { | 104 typeEquivalence: (ResolutionDartType a, ResolutionDartType b) { |
| 121 return areTypesEquivalent(unalias(a), unalias(b)); | 105 return areTypesEquivalent(unalias(a), unalias(b)); |
| 122 }, elementFilter: (Element element) { | 106 }, elementFilter: (Element element) { |
| 123 if (element is ConstructorElement && element.isRedirectingFactory) { | 107 if (element is ConstructorElement && element.isRedirectingFactory) { |
| 124 // Redirecting factory constructors are skipped in kernel. | 108 // Redirecting factory constructors are skipped in kernel. |
| 125 return false; | 109 return false; |
| 126 } | 110 } |
| 127 if (element is ClassElement) { | 111 if (element is ClassElement) { |
| 128 for (ConstructorElement constructor in element.constructors) { | 112 for (ConstructorElement constructor in element.constructors) { |
| 129 if (!constructor.isRedirectingFactory) { | 113 if (!constructor.isRedirectingFactory) { |
| 130 return true; | 114 return true; |
| 131 } | 115 } |
| 132 } | 116 } |
| 133 // The class cannot itself be instantiated. | 117 // The class cannot itself be instantiated. |
| 134 return false; | 118 return false; |
| 135 } | 119 } |
| 136 return true; | 120 return true; |
| 137 }, verbose: arguments.verbose); | 121 }, verbose: arguments.verbose); |
| 138 checkClosedWorlds( | 122 checkClosedWorlds( |
| 139 compiler.resolutionWorldBuilder.closedWorldForTesting, closedWorld, | 123 compiler.resolutionWorldBuilder.closedWorldForTesting, closedWorld, |
| 140 verbose: arguments.verbose); | 124 verbose: arguments.verbose); |
| 141 }); | 125 }); |
| 142 } | 126 } |
| 127 |
| 128 ClosedWorld computeClosedWorld(Compiler compiler, ResolutionEnqueuer enqueuer) { |
| 129 JavaScriptBackend backend = compiler.backend; |
| 130 |
| 131 // TODO(johnniwinther): Store backend info separately. This replacement is |
| 132 // made to reset a field in [TypeVariableHandler] that prevents it from |
| 133 // enqueuing twice. |
| 134 backend.typeVariableHandler = new TypeVariableHandler(compiler); |
| 135 |
| 136 if (compiler.deferredLoadTask.isProgramSplit) { |
| 137 enqueuer.applyImpact(backend.computeDeferredLoadingImpact()); |
| 138 } |
| 139 enqueuer.applyImpact(backend.computeHelpersImpact()); |
| 140 enqueuer.applyImpact(enqueuer.nativeEnqueuer |
| 141 .processNativeClasses(compiler.libraryLoader.libraries)); |
| 142 enqueuer.applyImpact( |
| 143 backend.computeMainImpact(compiler.mainFunction, forResolution: true)); |
| 144 enqueuer.forEach((work) { |
| 145 AstElement element = work.element; |
| 146 ResolutionImpact resolutionImpact = build(compiler, element.resolvedAst); |
| 147 WorldImpact worldImpact = compiler.backend.impactTransformer |
| 148 .transformResolutionImpact(enqueuer, resolutionImpact); |
| 149 enqueuer.applyImpact(worldImpact, impactSource: element); |
| 150 }); |
| 151 return enqueuer.worldBuilder.closeWorld(compiler.reporter); |
| 152 } |
| OLD | NEW |