dart2js: Split TypeTestEmitter into a registry and an emitter.

pkg/compiler/lib/src/js_emitter/code_emitter_task.dart

 // Copyright (c) 2012, 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;
 
 const USE_NEW_EMITTER = const bool.fromEnvironment("dart2js.use.new.emitter");
 
 /**
  * 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 CodeEmitterTask extends CompilerTask {
   // TODO(floitsch): the code-emitter task should not need a namer.
   final Namer namer;
-  final TypeTestEmitter typeTestEmitter = new TypeTestEmitter();
+  final TypeTestRegistry typeTestRegistry;
   NativeEmitter nativeEmitter;
   OldEmitter oldEmitter;
   Emitter emitter;
 
   final Set<ClassElement> neededClasses = new Set<ClassElement>();
   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 =
@@ skipping 11 matching lines @@
   /// Records if a type variable is read dynamically for type tests.
   final Set<TypeVariableElement> readTypeVariables =
       new Set<TypeVariableElement>();
 
   List<TypedefElement> typedefsNeededForReflection;
 
   JavaScriptBackend get backend => compiler.backend;
 
   CodeEmitterTask(Compiler compiler, Namer namer, bool generateSourceMap)
       : super(compiler),
-        this.namer = namer {
+        this.namer = namer,
+        this.typeTestRegistry = new TypeTestRegistry(compiler) {
     oldEmitter = new OldEmitter(compiler, namer, generateSourceMap, this);
     emitter = USE_NEW_EMITTER
         ? new new_js_emitter.Emitter(compiler, namer)
         : oldEmitter;
     nativeEmitter = new NativeEmitter(this);
-    typeTestEmitter.emitter = this.oldEmitter;
   }
 
 
   jsAst.Expression generateEmbeddedGlobalAccess(String global) {
     return emitter.generateEmbeddedGlobalAccess(global);
   }
 
   jsAst.Expression constantReference(ConstantValue value) {
     return emitter.constantReference(value);
   }
@@ skipping 71 matching lines @@
         if (backend.isAccessibleByReflection(element)) {
           bool shouldRetainMetadata = backend.retainMetadataOf(element);
           if (shouldRetainMetadata && element.isFunction) {
             FunctionElement function = element;
             function.functionSignature.forEachParameter(
                 backend.retainMetadataOf);
           }
         }
       }
       for (ClassElement cls in neededClasses) {
-        final onlyForRti = typeTestEmitter.rtiNeededClasses.contains(cls);
+        final onlyForRti = typeTestRegistry.rtiNeededClasses.contains(cls);
         if (!onlyForRti) {
           backend.retainMetadataOf(cls);
           oldEmitter.classEmitter.visitFields(cls, false,
               (Element member,
                String name,
                String accessorName,
                bool needsGetter,
                bool needsSetter,
                bool needsCheckedSetter) {
             bool needsAccessor = needsGetter || needsSetter;
@@ skipping 82 matching lines @@
       }
     }
 
     // 4. Find all classes needed for rti.
     // It is important that this is the penultimate step, at this point,
     // 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.
-    typeTestEmitter.computeRtiNeededClasses();
+    typeTestRegistry.computeRtiNeededClasses();
 
     // TODO(floitsch): either change the name, or get the rti-classes
     // differently.
-    typeTestEmitter.rtiNeededClasses.removeAll(neededClasses);
+    typeTestRegistry.rtiNeededClasses.removeAll(neededClasses);
     // rtiNeededClasses now contains only the "empty shells".
-    neededClasses.addAll(typeTestEmitter.rtiNeededClasses);
+    neededClasses.addAll(typeTestRegistry.rtiNeededClasses);
 
     // TODO(18175, floitsch): remove once issue 18175 is fixed.
     if (neededClasses.contains(backend.jsIntClass)) {
       neededClasses.add(compiler.intClass);
     }
     if (neededClasses.contains(backend.jsDoubleClass)) {
       neededClasses.add(compiler.doubleClass);
     }
     if (neededClasses.contains(backend.jsNumberClass)) {
       neededClasses.add(compiler.numClass);
     }
     if (neededClasses.contains(backend.jsStringClass)) {
       neededClasses.add(compiler.stringClass);
     }
     if (neededClasses.contains(backend.jsBoolClass)) {
       neededClasses.add(compiler.boolClass);
     }
     if (neededClasses.contains(backend.jsArrayClass)) {
       neededClasses.add(compiler.listClass);
     }
 
     // 5. Finally, sort the classes.
     List<ClassElement> sortedClasses = Elements.sortedByPosition(neededClasses);
 
     for (ClassElement element in sortedClasses) {
       if (Elements.isNativeOrExtendsNative(element) &&
-          !typeTestEmitter.rtiNeededClasses.contains(element)) {
+          !typeTestRegistry.rtiNeededClasses.contains(element)) {
         // For now, native classes and related classes cannot be deferred.
         nativeClasses.add(element);
         if (!element.isNative) {
           assert(invariant(element,
                            !compiler.deferredLoadTask.isDeferred(element)));
           outputClassLists.putIfAbsent(compiler.deferredLoadTask.mainOutputUnit,
               () => new List<ClassElement>()).add(element);
         }
       } else {
         outputClassLists.putIfAbsent(
@@ skipping 30 matching lines @@
     backend.generatedCode.keys.forEach(addSurroundingLibraryToSet);
     neededClasses.forEach(addSurroundingLibraryToSet);
 }
 
   void assembleProgram() {
     measure(() {
       emitter.invalidateCaches();
 
       // Compute the required type checks to know which classes need a
       // 'is$' method.
-      typeTestEmitter.computeRequiredTypeChecks();
+      typeTestRegistry.computeRequiredTypeChecks();
 
       computeNeededDeclarations();
       computeNeededConstants();
       computeNeededStatics();
       computeNeededLibraries();
 
 
       Program program;
       if (USE_NEW_EMITTER) {
         program = new ProgramBuilder(compiler, namer, this).buildProgram();
       }
       emitter.emitProgram(program);
     });
   }
 }
 
 abstract class Emitter {
   void emitProgram(Program program);
 
   jsAst.Expression generateEmbeddedGlobalAccess(String global);
   jsAst.Expression constantReference(ConstantValue value);
 
   int compareConstants(ConstantValue a, ConstantValue b);
   bool isConstantInlinedOrAlreadyEmitted(ConstantValue constant);
 
   void invalidateCaches();
 }