Merge CommonElements and BackendHelpers!

pkg/compiler/lib/src/native/enqueue.dart

 // Copyright (c) 2014, 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.
 
 import '../common/backend_api.dart';
 import '../common_elements.dart' show CommonElements, ElementEnvironment;
 import '../elements/elements.dart';
 import '../elements/entities.dart';
 import '../elements/resolution_types.dart';
 import '../elements/types.dart';
-import '../js_backend/backend_helpers.dart' show BackendHelpers;
 import '../js_backend/backend_usage.dart' show BackendUsageBuilder;
 import '../js_backend/native_data.dart' show NativeData;
 import '../js_emitter/js_emitter.dart' show CodeEmitterTask, NativeEmitter;
 import '../options.dart';
 import '../universe/use.dart' show StaticUse, TypeUse;
 import '../universe/world_impact.dart'
     show WorldImpact, WorldImpactBuilder, WorldImpactBuilderImpl;
 import 'behavior.dart';
 import 'resolver.dart' show NativeClassResolver;
 
@@ skipping 25 matching lines @@
   final Set<ClassEntity> _unusedClasses = new Set<ClassEntity>();
 
   bool get hasInstantiatedNativeClasses => !_registeredClasses.isEmpty;
 
   /// Log message reported if all native types are used.
   String _allUsedMessage;
 
   final CompilerOptions _options;
   final ElementEnvironment _elementEnvironment;
   final CommonElements _commonElements;
-  final BackendHelpers _helpers;
   final BackendClasses _backendClasses;
 
   /// Subclasses of [NativeEnqueuerBase] are constructed by the backend.
   NativeEnqueuerBase(this._options, this._elementEnvironment,
-      this._commonElements, this._helpers, this._backendClasses);
+      this._commonElements, this._backendClasses);
 
   bool get enableLiveTypeAnalysis => _options.enableNativeLiveTypeAnalysis;
 
   void onInstantiatedType(InterfaceType type) {
     if (_unusedClasses.remove(type.element)) {
       _registeredClasses.add(type.element);
     }
   }
 
   /// Register [classes] as natively instantiated in [impactBuilder].
@@ skipping 83 matching lines @@
   }
 
   void _registerBackendUse(FunctionEntity element) {}
 
   Iterable<ClassEntity> _onFirstNativeClass(WorldImpactBuilder impactBuilder) {
     void staticUse(FunctionEntity element) {
       impactBuilder.registerStaticUse(new StaticUse.implicitInvoke(element));
       _registerBackendUse(element);
     }
 
-    staticUse(_helpers.defineProperty);
-    staticUse(_helpers.toStringForNativeObject);
-    staticUse(_helpers.hashCodeForNativeObject);
-    staticUse(_helpers.closureConverter);
+    staticUse(_commonElements.defineProperty);
+    staticUse(_commonElements.toStringForNativeObject);
+    staticUse(_commonElements.hashCodeForNativeObject);
+    staticUse(_commonElements.closureConverter);
     return _findNativeExceptions();
   }
 
   Iterable<ClassEntity> _findNativeExceptions() {
     return _findUnusedClassesMatching((ClassEntity classElement) {
       // TODO(sra): Annotate exception classes in dart:html.
       String name = classElement.name;
       if (name.contains('Exception')) return true;
       if (name.contains('Error')) return true;
       return false;
@@ skipping 12 matching lines @@
   final BackendUsageBuilder _backendUsageBuilder;
 
   /// The set of all native classes.  Each native class is in [nativeClasses]
   /// and exactly one of [unusedClasses] and [registeredClasses].
   final Set<ClassEntity> _nativeClasses = new Set<ClassEntity>();
 
   NativeResolutionEnqueuer(
       CompilerOptions options,
       ElementEnvironment elementEnvironment,
       CommonElements commonElements,
-      BackendHelpers helpers,
       BackendClasses backendClasses,
       this._backendUsageBuilder,
       this._nativeClassResolver)
-      : super(options, elementEnvironment, commonElements, helpers,
-            backendClasses);
+      : super(options, elementEnvironment, commonElements, backendClasses);
 
   void _registerBackendUse(FunctionEntity element) {
     _backendUsageBuilder.registerBackendFunctionUse(element);
     _backendUsageBuilder.registerGlobalFunctionDependency(element);
   }
 
   WorldImpact processNativeClasses(Iterable<LibraryEntity> libraries) {
     WorldImpactBuilderImpl impactBuilder = new WorldImpactBuilderImpl();
     Iterable<ClassEntity> nativeClasses =
         _nativeClassResolver.computeNativeClasses(libraries);
@@ skipping 16 matching lines @@
   final CodeEmitterTask _emitter;
   final NativeResolutionEnqueuer _resolutionEnqueuer;
   final NativeData _nativeData;
 
   final Set<ClassEntity> _doneAddSubtypes = new Set<ClassEntity>();
 
   NativeCodegenEnqueuer(
       CompilerOptions options,
       ElementEnvironment elementEnvironment,
       CommonElements commonElements,
-      BackendHelpers helpers,
       BackendClasses backendClasses,
       this._emitter,
       this._resolutionEnqueuer,
       this._nativeData)
-      : super(options, elementEnvironment, commonElements, helpers,
-            backendClasses);
+      : super(options, elementEnvironment, commonElements, backendClasses);
 
   WorldImpact processNativeClasses(Iterable<LibraryElement> libraries) {
     WorldImpactBuilderImpl impactBuilder = new WorldImpactBuilderImpl();
     _unusedClasses.addAll(_resolutionEnqueuer._nativeClasses);
 
     if (!enableLiveTypeAnalysis) {
       _registerTypeUses(
           impactBuilder, _resolutionEnqueuer._nativeClasses, 'forced');
     }
 
@@ skipping 50 matching lines @@
         emitter.directSubtypes.putIfAbsent(superclass, () => <ClassEntity>[]);
     directSubtypes.add(cls);
   }
 
   void logSummary(void log(String message)) {
     super.logSummary(log);
     log('Compiled ${_registeredClasses.length} native classes, '
         '${_unusedClasses.length} native classes omitted.');
   }
 }