Merge CommonElements and BackendHelpers!

pkg/compiler/lib/src/js_emitter/program_builder/collector.dart

 // Copyright (c) 2015, 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.
 
 part of dart2js.js_emitter.program_builder;
 
 /**
  * Generates the code for all used classes in the program. Static fields (even
  * in classes) are ignored, since they can be treated as non-class elements.
  *
@@ skipping 25 matching lines @@
   ///
   /// This flag is updated in [computeNeededConstants].
   bool outputContainsConstantList = false;
 
   final List<ClassElement> nativeClassesAndSubclasses = <ClassElement>[];
 
   List<TypedefElement> typedefsNeededForReflection;
 
   JavaScriptBackend get backend => compiler.backend;
 
-  BackendHelpers get helpers => backend.helpers;
-
   CommonElements get commonElements => compiler.commonElements;
 
   Collector(this.compiler, this.namer, this.closedWorld, this.rtiNeededClasses,
       this.emitter);
 
   Set<ClassElement> computeInterceptorsReferencedFromConstants() {
     Set<ClassElement> classes = new Set<ClassElement>();
     JavaScriptConstantCompiler handler = backend.constants;
     List<ConstantValue> constants = handler.getConstantsForEmission();
     for (ConstantValue constant in constants) {
@@ skipping 34 matching lines @@
     // Add unneeded interceptors to the [unneededClasses] set.
     for (ClassEntity interceptor
         in backend.interceptorData.interceptedClasses) {
       if (!needed.contains(interceptor) &&
           interceptor != commonElements.objectClass) {
         unneededClasses.add(interceptor);
       }
     }
 
     // These classes are just helpers for the backend's type system.
-    unneededClasses.add(helpers.jsMutableArrayClass);
-    unneededClasses.add(helpers.jsFixedArrayClass);
-    unneededClasses.add(helpers.jsExtendableArrayClass);
-    unneededClasses.add(helpers.jsUInt32Class);
-    unneededClasses.add(helpers.jsUInt31Class);
-    unneededClasses.add(helpers.jsPositiveIntClass);
+    unneededClasses.add(commonElements.jsMutableArrayClass);
+    unneededClasses.add(commonElements.jsFixedArrayClass);
+    unneededClasses.add(commonElements.jsExtendableArrayClass);
+    unneededClasses.add(commonElements.jsUInt32Class);
+    unneededClasses.add(commonElements.jsUInt31Class);
+    unneededClasses.add(commonElements.jsPositiveIntClass);
 
     return (ClassEntity cls) => !unneededClasses.contains(cls);
   }
 
   /**
    * Compute all the constants that must be emitted.
    */
   void computeNeededConstants() {
     // Make sure we retain all metadata of all elements. This could add new
     // constants to the handler.
@@ skipping 102 matching lines @@
     // neededClasses must only contain classes that have been resolved and
     // codegen'd. The rtiNeededClasses may contain additional classes, but
     // these are thought to not have been instantiated, so we neeed to be able
     // to identify them later and make sure we only emit "empty shells" without
     // fields, etc.
     classesOnlyNeededForRti = rtiNeededClasses.difference(neededClasses);
 
     neededClasses.addAll(classesOnlyNeededForRti);
 
     // TODO(18175, floitsch): remove once issue 18175 is fixed.
-    if (neededClasses.contains(helpers.jsIntClass)) {
+    if (neededClasses.contains(commonElements.jsIntClass)) {
       neededClasses.add(commonElements.intClass);
     }
-    if (neededClasses.contains(helpers.jsDoubleClass)) {
+    if (neededClasses.contains(commonElements.jsDoubleClass)) {
       neededClasses.add(commonElements.doubleClass);
     }
-    if (neededClasses.contains(helpers.jsNumberClass)) {
+    if (neededClasses.contains(commonElements.jsNumberClass)) {
       neededClasses.add(commonElements.numClass);
     }
-    if (neededClasses.contains(helpers.jsStringClass)) {
+    if (neededClasses.contains(commonElements.jsStringClass)) {
       neededClasses.add(commonElements.stringClass);
     }
-    if (neededClasses.contains(helpers.jsBoolClass)) {
+    if (neededClasses.contains(commonElements.jsBoolClass)) {
       neededClasses.add(commonElements.boolClass);
     }
-    if (neededClasses.contains(helpers.jsArrayClass)) {
+    if (neededClasses.contains(commonElements.jsArrayClass)) {
       neededClasses.add(commonElements.listClass);
     }
 
     // 4. Finally, sort the classes.
     List<ClassElement> sortedClasses = Elements.sortedByPosition(neededClasses);
 
     for (ClassElement element in sortedClasses) {
       if (backend.nativeData.isNativeOrExtendsNative(element) &&
           !classesOnlyNeededForRti.contains(element)) {
         // For now, native classes and related classes cannot be deferred.
@@ skipping 72 matching lines @@
   }
 
   void collect() {
     computeNeededDeclarations();
     computeNeededConstants();
     computeNeededStatics();
     computeNeededStaticNonFinalFields();
     computeNeededLibraries();
   }
 }