Rename KernelWorldBuilder to KernelElementBuilder

tests/compiler/dart2js/kernel/closed_world2_test.dart

 // Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // Partial test that the closed world computed from [WorldImpact]s derived from
 // kernel is equivalent to the original computed from resolution.
 library dart2js.kernel.closed_world2_test;
 
 import 'package:async_helper/async_helper.dart';
 import 'package:compiler/src/closure.dart';
@@ skipping 17 matching lines @@
 import 'package:compiler/src/js_backend/native_data.dart';
 import 'package:compiler/src/js_backend/impact_transformer.dart';
 import 'package:compiler/src/js_backend/interceptor_data.dart';
 import 'package:compiler/src/js_backend/lookup_map_analysis.dart';
 import 'package:compiler/src/js_backend/mirrors_analysis.dart';
 import 'package:compiler/src/js_backend/mirrors_data.dart';
 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_map.dart';
 import 'package:compiler/src/options.dart';
 import 'package:compiler/src/universe/world_builder.dart';
 import 'package:compiler/src/universe/world_impact.dart';
 import 'package:compiler/src/world.dart';
 import '../memory_compiler.dart';
 import '../serialization/helper.dart';
 import '../serialization/model_test_helper.dart';
 import '../serialization/test_helper.dart';
 
 import 'closed_world_test.dart';
@@ skipping 40 matching lines @@
         memorySourceFiles: memorySourceFiles,
         options: [
           Flags.analyzeAll,
           Flags.useKernel,
           Flags.enableAssertMessage
         ]);
     await compiler.run(entryPoint);
     compiler.resolutionWorldBuilder.closeWorld();
 
     print('---- closed world from kernel ------------------------------------');
-    KernelWorldBuilder worldBuilder = new KernelWorldBuilder(
+    KernelToElementMap elementMap = new KernelToElementMap(
         compiler.reporter, compiler.backend.kernelTask.program);
-    KernelEquivalence equivalence = new KernelEquivalence(worldBuilder);
-    NativeBasicData nativeBasicData = computeNativeBasicData(worldBuilder);
+    KernelEquivalence equivalence = new KernelEquivalence(elementMap);
+    NativeBasicData nativeBasicData = computeNativeBasicData(elementMap);
     checkNativeBasicData(
         compiler.backend.nativeBasicData, nativeBasicData, equivalence);
     List list = createKernelResolutionEnqueuerListener(
         compiler.options,
         compiler.reporter,
         compiler.deferredLoadTask,
-        worldBuilder,
+        elementMap,
         nativeBasicData);
     ResolutionEnqueuerListener resolutionEnqueuerListener = list[0];
     BackendUsageBuilder backendUsageBuilder2 = list[1];
     ImpactTransformer impactTransformer = list[2];
     ResolutionEnqueuer enqueuer2 = new ResolutionEnqueuer(
         compiler.enqueuer,
         compiler.options,
         compiler.reporter,
         const TreeShakingEnqueuerStrategy(),
         resolutionEnqueuerListener,
         new KernelResolutionWorldBuilder(
-            worldBuilder, nativeBasicData, const OpenWorldStrategy()),
-        new KernelWorkItemBuilder(worldBuilder, impactTransformer),
+            elementMap, nativeBasicData, const OpenWorldStrategy()),
+        new KernelWorkItemBuilder(elementMap, impactTransformer),
         'enqueuer from kelements');
     ClosedWorld closedWorld2 = computeClosedWorld(
-        compiler.reporter, enqueuer2, worldBuilder.elementEnvironment);
+        compiler.reporter, enqueuer2, elementMap.elementEnvironment);
     BackendUsage backendUsage2 = backendUsageBuilder2.close();
     checkBackendUsage(backendUsage1, backendUsage2, equivalence);
 
     checkResolutionEnqueuers(backendUsage1, backendUsage2, enqueuer1, enqueuer2,
         elementEquivalence: equivalence.entityEquivalence,
         typeEquivalence: (ResolutionDartType a, DartType b) {
       return equivalence.typeEquivalence(unalias(a), b);
     }, elementFilter: elementFilter, verbose: arguments.verbose);
 
     checkClosedWorlds(closedWorld1, closedWorld2, equivalence.entityEquivalence,
         verbose: arguments.verbose);
   });
 }
 
 List createKernelResolutionEnqueuerListener(
     CompilerOptions options,
     DiagnosticReporter reporter,
     DeferredLoadTask deferredLoadTask,
-    KernelWorldBuilder worldBuilder,
+    KernelToElementMap elementMap,
     NativeBasicData nativeBasicData) {
-  ElementEnvironment elementEnvironment = worldBuilder.elementEnvironment;
-  CommonElements commonElements = worldBuilder.commonElements;
+  ElementEnvironment elementEnvironment = elementMap.elementEnvironment;
+  CommonElements commonElements = elementMap.commonElements;
   BackendImpacts impacts = new BackendImpacts(options, commonElements);
 
   // TODO(johnniwinther): Create Kernel based implementations for these:
   RuntimeTypesNeedBuilder rtiNeedBuilder = new RuntimeTypesNeedBuilderImpl();
   MirrorsDataBuilder mirrorsDataBuilder = new MirrorsDataBuilderImpl();
   CustomElementsResolutionAnalysis customElementsResolutionAnalysis =
       new CustomElementsResolutionAnalysisImpl();
   MirrorsResolutionAnalysis mirrorsResolutionAnalysis =
       new MirrorsResolutionAnalysisImpl();
   LookupMapResolutionAnalysis lookupMapResolutionAnalysis =
       new LookupMapResolutionAnalysis(reporter, elementEnvironment);
 
   InterceptorDataBuilder interceptorDataBuilder =
       new InterceptorDataBuilderImpl(
           nativeBasicData, elementEnvironment, commonElements);
   BackendUsageBuilder backendUsageBuilder =
       new BackendUsageBuilderImpl(commonElements);
   NoSuchMethodRegistry noSuchMethodRegistry = new NoSuchMethodRegistry(
-      commonElements, new KernelNoSuchMethodResolver(worldBuilder));
+      commonElements, new KernelNoSuchMethodResolver(elementMap));
   NativeResolutionEnqueuer nativeResolutionEnqueuer =
       new NativeResolutionEnqueuer(options, elementEnvironment, commonElements,
-          backendUsageBuilder, new KernelNativeClassResolver(worldBuilder));
+          backendUsageBuilder, new KernelNativeClassResolver(elementMap));
 
   ResolutionEnqueuerListener listener = new ResolutionEnqueuerListener(
       options,
       elementEnvironment,
       commonElements,
       impacts,
       nativeBasicData,
       interceptorDataBuilder,
       backendUsageBuilder,
       rtiNeedBuilder,
@@ skipping 16 matching lines @@
       nativeResolutionEnqueuer,
       backendUsageBuilder,
       mirrorsDataBuilder,
       customElementsResolutionAnalysis,
       rtiNeedBuilder);
   return [listener, backendUsageBuilder, transformer];
 }
 
 /// Computes that NativeBasicData for the libraries in [worldBuilder].
 /// TODO(johnniwinther): Use [KernelAnnotationProcessor] instead.
-NativeBasicData computeNativeBasicData(KernelWorldBuilder worldBuilder) {
+NativeBasicData computeNativeBasicData(KernelToElementMap elementMap) {
   NativeBasicDataBuilderImpl builder = new NativeBasicDataBuilderImpl();
-  ElementEnvironment elementEnvironment = worldBuilder.elementEnvironment;
+  ElementEnvironment elementEnvironment = elementMap.elementEnvironment;
   for (LibraryEntity library in elementEnvironment.libraries) {
     if (library.canonicalUri.scheme == 'dart') {
-      new KernelAnnotationProcessor(worldBuilder)
+      new KernelAnnotationProcessor(elementMap)
           .extractNativeAnnotations(library, builder);
     }
   }
   return builder.close(elementEnvironment);
 }
 
 class RuntimeTypesNeedBuilderImpl implements RuntimeTypesNeedBuilder {
   @override
   void registerClassUsingTypeVariableExpression(ClassEntity cls) {}
 
@@ skipping 65 matching lines @@
   @override
   MirrorsCodegenAnalysis close() {
     throw new UnimplementedError('MirrorsResolutionAnalysisImpl.close');
   }
 
   @override
   void onResolutionComplete() {}
 }
 
 class KernelWorkItemBuilder implements WorkItemBuilder {
-  final KernelWorldBuilder _worldBuilder;
+  final KernelToElementMap _worldBuilder;
   final ImpactTransformer _impactTransformer;
 
   KernelWorkItemBuilder(this._worldBuilder, this._impactTransformer);
 
   @override
   WorkItem createWorkItem(MemberEntity entity) {
     return new KernelWorkItem(_worldBuilder, _impactTransformer, entity);
   }
 }
 
 class KernelWorkItem implements ResolutionWorkItem {
-  final KernelWorldBuilder _worldBuilder;
+  final KernelToElementMap _worldBuilder;
   final ImpactTransformer _impactTransformer;
   final MemberEntity element;
 
   KernelWorkItem(this._worldBuilder, this._impactTransformer, this.element);
 
   @override
   WorldImpact run() {
     ResolutionImpact impact = _worldBuilder.computeWorldImpact(element);
     return _impactTransformer.transformResolutionImpact(impact);
   }
@@ skipping 60 matching lines @@
       usage2.isInvokeOnUsed);
   check(usage1, usage2, 'isRuntimeTypeUsed', usage1.isRuntimeTypeUsed,
       usage2.isRuntimeTypeUsed);
   check(usage1, usage2, 'isIsolateInUse', usage1.isIsolateInUse,
       usage2.isIsolateInUse);
   check(usage1, usage2, 'isFunctionApplyUsed', usage1.isFunctionApplyUsed,
       usage2.isFunctionApplyUsed);
   check(usage1, usage2, 'isNoSuchMethodUsed', usage1.isNoSuchMethodUsed,
       usage2.isNoSuchMethodUsed);
 }