Revert "Various redemptions"

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 30 matching lines @@
   final Map<OutputUnit, List<FieldEntity>> outputStaticNonFinalFieldLists =
       new Map<OutputUnit, List<FieldEntity>>();
   final Map<OutputUnit, Set<LibraryEntity>> outputLibraryLists =
       new Map<OutputUnit, Set<LibraryEntity>>();
 
   /// True, if the output contains a constant list.
   ///
   /// This flag is updated in [computeNeededConstants].
   bool outputContainsConstantList = false;
 
-  final List<ClassEntity> nativeClassesAndSubclasses = <ClassEntity>[];
+  final List<ClassElement> nativeClassesAndSubclasses = <ClassElement>[];
 
   List<TypedefEntity> typedefsNeededForReflection;
 
   Collector(
       this._options,
       this._commonElements,
       this._elementEnvironment,
       this._deferredLoadTask,
       this._worldBuilder,
       this._namer,
@@ skipping 19 matching lines @@
     }
     return classes;
   }
 
   /**
    * Return a function that returns true if its argument is a class
    * that needs to be emitted.
    */
   Function computeClassFilter() {
     if (_mirrorsData.isTreeShakingDisabled) {
-      return (ClassEntity cls) => true;
+      return (ClassElement cls) => true;
     }
 
     Set<ClassEntity> unneededClasses = new Set<ClassEntity>();
     // The [Bool] class is not marked as abstract, but has a factory
     // constructor that always throws. We never need to emit it.
     unneededClasses.add(_commonElements.boolClass);
 
     // Go over specialized interceptors and then constants to know which
     // interceptors are needed.
     Set<ClassEntity> needed = new Set<ClassEntity>();
@@ skipping 27 matching lines @@
 
   /**
    * 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.
     if (_mirrorsData.mustRetainMetadata) {
       // TODO(floitsch): verify that we don't run through the same elements
       // multiple times.
-      for (MemberEntity element in _generatedCode.keys) {
+      for (MemberElement element in _generatedCode.keys) {
         if (_mirrorsData.isMemberAccessibleByReflection(element)) {
           _mirrorsData.retainMetadataOfMember(element);
         }
       }
-      for (ClassEntity cls in neededClasses) {
+      for (ClassElement cls in neededClasses) {
         final onlyForRti = classesOnlyNeededForRti.contains(cls);
         if (!onlyForRti) {
           _mirrorsData.retainMetadataOfClass(cls);
-          new FieldVisitor(
-                  _options,
-                  _elementEnvironment,
-                  _commonElements,
-                  _worldBuilder,
-                  _nativeData,
-                  _mirrorsData,
-                  _namer,
-                  _closedWorld)
+          new FieldVisitor(_options, _elementEnvironment, _worldBuilder,
+                  _nativeData, _mirrorsData, _namer, _closedWorld)
               .visitFields((FieldEntity member,
                   js.Name name,
                   js.Name accessorName,
                   bool needsGetter,
                   bool needsSetter,
                   bool needsCheckedSetter) {
             bool needsAccessor = needsGetter || needsSetter;
             if (needsAccessor &&
                 _mirrorsData.isMemberAccessibleByReflection(member)) {
               _mirrorsData.retainMetadataOfMember(member);
@@ skipping 183 matching lines @@
   }
 
   void collect() {
     computeNeededDeclarations();
     computeNeededConstants();
     computeNeededStatics();
     computeNeededStaticNonFinalFields();
     computeNeededLibraries();
   }
 }