| Index: tests/compiler/dart2js/kernel/closed_world2_test.dart
|
| diff --git a/tests/compiler/dart2js/kernel/closed_world2_test.dart b/tests/compiler/dart2js/kernel/closed_world2_test.dart
|
| index 8b54d774fe6aebc0065232fc998e8593b894cadb..ad2c55f94d5164f1db73af9afacf22cc047a48be 100644
|
| --- a/tests/compiler/dart2js/kernel/closed_world2_test.dart
|
| +++ b/tests/compiler/dart2js/kernel/closed_world2_test.dart
|
| @@ -35,7 +35,7 @@ import 'package:compiler/src/js_backend/no_such_method_registry.dart';
|
| import 'package:compiler/src/js_backend/resolution_listener.dart';
|
| import 'package:compiler/src/js_backend/type_variable_handler.dart';
|
| import 'package:compiler/src/native/enqueue.dart';
|
| -import 'package:compiler/src/kernel/world_builder.dart';
|
| +import 'package:compiler/src/kernel/element_builder.dart';
|
| import 'package:compiler/src/options.dart';
|
| import 'package:compiler/src/universe/world_builder.dart';
|
| import 'package:compiler/src/universe/world_impact.dart';
|
| @@ -72,10 +72,10 @@ main(List<String> args) {
|
| await compiler.run(entryPoint);
|
| compiler.resolutionWorldBuilder.closeWorld(compiler.reporter);
|
|
|
| - KernelWorldBuilder worldBuilder = new KernelWorldBuilder(
|
| + KernelElementBuilder elementBuilder = new KernelElementBuilder(
|
| compiler.reporter, compiler.backend.kernelTask.program);
|
| List list = createKernelResolutionEnqueuerListener(compiler.options,
|
| - compiler.reporter, compiler.deferredLoadTask, worldBuilder);
|
| + compiler.reporter, compiler.deferredLoadTask, elementBuilder);
|
| ResolutionEnqueuerListener resolutionEnqueuerListener = list[0];
|
| ImpactTransformer impactTransformer = list[1];
|
| ResolutionEnqueuer enqueuer = new ResolutionEnqueuer(
|
| @@ -85,15 +85,15 @@ main(List<String> args) {
|
| const TreeShakingEnqueuerStrategy(),
|
| resolutionEnqueuerListener,
|
| new KernelResolutionWorldBuilder(
|
| - worldBuilder.elementEnvironment,
|
| - worldBuilder.commonElements,
|
| + elementBuilder.elementEnvironment,
|
| + elementBuilder.commonElements,
|
| new NativeBasicDataImpl(),
|
| const OpenWorldStrategy()),
|
| - new KernelWorkItemBuilder(worldBuilder, impactTransformer),
|
| + new KernelWorkItemBuilder(elementBuilder, impactTransformer),
|
| 'enqueuer from kelements');
|
|
|
| computeClosedWorld(
|
| - compiler.reporter, enqueuer, worldBuilder.elementEnvironment);
|
| + compiler.reporter, enqueuer, elementBuilder.elementEnvironment);
|
| });
|
| }
|
|
|
| @@ -101,9 +101,9 @@ List createKernelResolutionEnqueuerListener(
|
| CompilerOptions options,
|
| DiagnosticReporter reporter,
|
| DeferredLoadTask deferredLoadTask,
|
| - KernelWorldBuilder worldBuilder) {
|
| - ElementEnvironment elementEnvironment = worldBuilder.elementEnvironment;
|
| - CommonElements commonElements = worldBuilder.commonElements;
|
| + KernelElementBuilder elementBuilder) {
|
| + ElementEnvironment elementEnvironment = elementBuilder.elementEnvironment;
|
| + CommonElements commonElements = elementBuilder.commonElements;
|
| BackendImpacts impacts = new BackendImpacts(options, commonElements);
|
|
|
| // TODO(johnniwinther): Create Kernel based implementations for these:
|
| @@ -122,10 +122,10 @@ List createKernelResolutionEnqueuerListener(
|
| BackendUsageBuilder backendUsageBuilder =
|
| new BackendUsageBuilderImpl(commonElements);
|
| NoSuchMethodRegistry noSuchMethodRegistry = new NoSuchMethodRegistry(
|
| - commonElements, new KernelNoSuchMethodResolver(worldBuilder));
|
| + commonElements, new KernelNoSuchMethodResolver(elementBuilder));
|
| NativeResolutionEnqueuer nativeResolutionEnqueuer =
|
| new NativeResolutionEnqueuer(options, elementEnvironment, commonElements,
|
| - backendUsageBuilder, new KernelNativeClassResolver(worldBuilder));
|
| + backendUsageBuilder, new KernelNativeClassResolver(elementBuilder));
|
|
|
| ResolutionEnqueuerListener listener = new ResolutionEnqueuerListener(
|
| options,
|
| @@ -274,7 +274,7 @@ class MirrorsResolutionAnalysisImpl implements MirrorsResolutionAnalysis {
|
| }
|
|
|
| class KernelWorkItemBuilder implements WorkItemBuilder {
|
| - final KernelWorldBuilder _worldBuilder;
|
| + final KernelElementBuilder _worldBuilder;
|
| final ImpactTransformer _impactTransformer;
|
|
|
| KernelWorkItemBuilder(this._worldBuilder, this._impactTransformer);
|
| @@ -286,7 +286,7 @@ class KernelWorkItemBuilder implements WorkItemBuilder {
|
| }
|
|
|
| class KernelWorkItem implements ResolutionWorkItem {
|
| - final KernelWorldBuilder _worldBuilder;
|
| + final KernelElementBuilder _worldBuilder;
|
| final ImpactTransformer _impactTransformer;
|
| final MemberEntity element;
|
|
|
|
|