dart2js: Move field-visiting code to the program-builder.

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.
  *
  * The code for the containing (used) methods must exist in the `universe`.
  */
 class Collector {
   // TODO(floitsch): the code-emitter task should not need a namer.
   final Namer namer;
   final Compiler compiler;
   final Set<ClassElement> rtiNeededClasses;
   final Emitter emitter;
-  // TODO(floitsch): remove this field.
-  // The field is untyped, because we don't want to import the full emitter
-  // class.
-  final oldEmitter;
 
   final Set<ClassElement> neededClasses = new Set<ClassElement>();
+  // This field is set in [computeNeededDeclarations].
   Set<ClassElement> classesOnlyNeededForRti;
   final Map<OutputUnit, List<ClassElement>> outputClassLists =
       new Map<OutputUnit, List<ClassElement>>();
   final Map<OutputUnit, List<ConstantValue>> outputConstantLists =
       new Map<OutputUnit, List<ConstantValue>>();
   final Map<OutputUnit, List<Element>> outputStaticLists =
       new Map<OutputUnit, List<Element>>();
   final Map<OutputUnit, List<VariableElement>> outputStaticNonFinalFieldLists =
       new Map<OutputUnit, List<VariableElement>>();
   final Map<OutputUnit, Set<LibraryElement>> outputLibraryLists =
       new Map<OutputUnit, Set<LibraryElement>>();
 
   /// True, if the output contains a constant list.
   ///
   /// This flag is updated in [computeNeededConstants].
   bool outputContainsConstantList = false;
 
   final List<ClassElement> nativeClassesAndSubclasses = <ClassElement>[];
 
   List<TypedefElement> typedefsNeededForReflection;
 
   JavaScriptBackend get backend => compiler.backend;
 
-  Collector(this.compiler, this.namer, this.rtiNeededClasses,
-            this.emitter, this.oldEmitter);
+  Collector(this.compiler, this.namer, 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) {
       if (constant is InterceptorConstantValue) {
         InterceptorConstantValue interceptorConstant = constant;
         classes.add(interceptorConstant.dispatchedType.element);
       }
@@ skipping 62 matching lines @@
             FunctionElement function = element;
             function.functionSignature.forEachParameter(
                 backend.retainMetadataOf);
           }
         }
       }
       for (ClassElement cls in neededClasses) {
         final onlyForRti = classesOnlyNeededForRti.contains(cls);
         if (!onlyForRti) {
           backend.retainMetadataOf(cls);
-          oldEmitter.classEmitter.visitFields(cls, false,
+          new FieldVisitor(compiler, namer).visitFields(cls, false,
               (Element member,
                js.Name name,
                js.Name accessorName,
                bool needsGetter,
                bool needsSetter,
                bool needsCheckedSetter) {
             bool needsAccessor = needsGetter || needsSetter;
             if (needsAccessor && backend.isAccessibleByReflection(member)) {
               backend.retainMetadataOf(member);
             }
@@ skipping 155 matching lines @@
   }
 
   void collect() {
     computeNeededDeclarations();
     computeNeededConstants();
     computeNeededStatics();
     computeNeededStaticNonFinalFields();
     computeNeededLibraries();
   }
 }