Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Unified Diff: tests/compiler/dart2js/kernel/closed_world_test.dart

Issue 2826673002: Remove JavaScriptBackend from ClosedWorldBase (Closed)
Patch Set: Fix Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tests/compiler/dart2js/kernel/closed_world_test.dart
diff --git a/tests/compiler/dart2js/kernel/closed_world_test.dart b/tests/compiler/dart2js/kernel/closed_world_test.dart
index b055c5b9987401b11d21364e0819833011036149..4ea4ea9b51d37862e7aabbfa657b88df34c9ec79 100644
--- a/tests/compiler/dart2js/kernel/closed_world_test.dart
+++ b/tests/compiler/dart2js/kernel/closed_world_test.dart
@@ -100,24 +100,27 @@ main(List<String> args) {
ElementResolutionWorldBuilder.useInstantiationMap = true;
compiler.resolution.retainCachesForTesting = true;
await compiler.run(entryPoint);
- compiler.resolutionWorldBuilder.closeWorld(compiler.reporter);
+ compiler.resolutionWorldBuilder.closeWorld();
JavaScriptBackend backend = compiler.backend;
// Create a new resolution enqueuer and feed it with the [WorldImpact]s
// computed from kernel through the [build] in `kernel_impact.dart`.
+ List list = createResolutionEnqueuerListener(compiler);
+ ResolutionEnqueuerListener resolutionEnqueuerListener = list[0];
+ BackendUsageBuilder backendUsageBuilder = list[1];
ResolutionEnqueuer enqueuer = new ResolutionEnqueuer(
compiler.enqueuer,
compiler.options,
compiler.reporter,
const TreeShakingEnqueuerStrategy(),
- createResolutionEnqueuerListener(compiler),
+ resolutionEnqueuerListener,
new ElementResolutionWorldBuilder(
backend, compiler.resolution, const OpenWorldStrategy()),
new KernelWorkItemBuilder(compiler),
'enqueuer from kernel');
ClosedWorld closedWorld = computeClosedWorld(
compiler.reporter, enqueuer, compiler.elementEnvironment);
- BackendUsage backendUsage = compiler.backend.backendUsageBuilder.close();
+ BackendUsage backendUsage = backendUsageBuilder.close();
checkResolutionEnqueuers(
backendUsage, backendUsage, compiler.enqueuer.resolution, enqueuer,
typeEquivalence: (ResolutionDartType a, ResolutionDartType b) {
@@ -144,27 +147,31 @@ main(List<String> args) {
});
}
-EnqueuerListener createResolutionEnqueuerListener(Compiler compiler) {
+List createResolutionEnqueuerListener(Compiler compiler) {
JavaScriptBackend backend = compiler.backend;
- return new ResolutionEnqueuerListener(
+ BackendUsageBuilder backendUsageBuilder =
+ new BackendUsageBuilderImpl(compiler.commonElements);
+ ResolutionEnqueuerListener listener = new ResolutionEnqueuerListener(
compiler.options,
compiler.elementEnvironment,
compiler.commonElements,
backend.impacts,
backend.nativeBasicData,
- backend.interceptorDataBuilder,
- backend.backendUsageBuilder,
+ new InterceptorDataBuilderImpl(backend.nativeBasicData,
+ compiler.elementEnvironment, compiler.commonElements),
+ backendUsageBuilder,
backend.rtiNeedBuilder,
backend.mirrorsDataBuilder,
backend.noSuchMethodRegistry,
backend.customElementsResolutionAnalysis,
backend.lookupMapResolutionAnalysis,
backend.mirrorsResolutionAnalysis,
- new TypeVariableResolutionAnalysis(compiler.elementEnvironment,
- backend.impacts, backend.backendUsageBuilder),
+ new TypeVariableResolutionAnalysis(
+ compiler.elementEnvironment, backend.impacts, backendUsageBuilder),
backend.nativeResolutionEnqueuer,
compiler.deferredLoadTask,
backend.kernelTask);
+ return [listener, backendUsageBuilder];
}
ClosedWorld computeClosedWorld(DiagnosticReporter reporter,
@@ -174,7 +181,7 @@ ClosedWorld computeClosedWorld(DiagnosticReporter reporter,
enqueuer.forEach((WorkItem work) {
enqueuer.applyImpact(work.run(), impactSource: work.element);
});
- return enqueuer.worldBuilder.closeWorld(reporter);
+ return enqueuer.worldBuilder.closeWorld();
}
class KernelWorkItemBuilder implements WorkItemBuilder {
« no previous file with comments | « tests/compiler/dart2js/kernel/closed_world2_test.dart ('k') | tests/compiler/dart2js/type_combination_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698