Revert r42934.

pkg/compiler/lib/src/js_emitter/old_emitter/emitter.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.
 
 part of dart2js.js_emitter;
 
 
 class OldEmitter implements Emitter {
   final Compiler compiler;
   final CodeEmitterTask task;
@@ skipping 714 matching lines @@
       function dart_precompiled(\$collectedClasses) {
         var \$desc;
         #;
         return #;
       }''',
         [cspPrecompiledFunctionFor(outputUnit),
          new jsAst.ArrayInitializer(
              cspPrecompiledConstructorNamesFor(outputUnit))]);
   }
 
-  void emitClass(Class cls, ClassBuilder enclosingBuilder) {
-    ClassElement classElement = cls.element;
+  void generateClass(ClassElement classElement, ClassBuilder properties) {
     compiler.withCurrentElement(classElement, () {
       if (compiler.hasIncrementalSupport) {
-        ClassBuilder cachedBuilder =
+        ClassBuilder builder =
             cachedClassBuilders.putIfAbsent(classElement, () {
               ClassBuilder builder = new ClassBuilder(classElement, namer);
-              classEmitter.emitClass(
-                  cls, builder, additionalProperties[classElement]);
+              classEmitter.generateClass(
+                  classElement, builder, additionalProperties[classElement]);
               return builder;
             });
-        invariant(classElement, cachedBuilder.fields.isEmpty);
-        invariant(classElement, cachedBuilder.superName == null);
-        invariant(classElement, cachedBuilder.functionType == null);
-        invariant(classElement, cachedBuilder.fieldMetadata == null);
-        enclosingBuilder.properties.addAll(cachedBuilder.properties);
+        invariant(classElement, builder.fields.isEmpty);
+        invariant(classElement, builder.superName == null);
+        invariant(classElement, builder.functionType == null);
+        invariant(classElement, builder.fieldMetadata == null);
+        properties.properties.addAll(builder.properties);
       } else {
-        classEmitter.emitClass(
-            cls, enclosingBuilder, additionalProperties[classElement]);
+        classEmitter.generateClass(
+            classElement, properties, additionalProperties[classElement]);
       }
     });
   }
 
   void emitStaticFunctions(Iterable<Method> staticFunctions) {
     if (staticFunctions == null) return;
     // We need to filter out null-elements for the interceptors.
     Iterable<Element> elements = staticFunctions
         .where((Method method) => method.element != null)
         .map((Method method) => method.element);
@@ skipping 593 matching lines @@
               element, MessageKind.GENERIC, {'text': 'Pending statics.'}));
     }
 
     if (pendingStatics != null && !pendingStatics.isEmpty) {
       compiler.internalError(pendingStatics.first,
           'Pending statics (see above).');
     }
   }
 
   void emitLibrary(Library library) {
-    LibraryElement libraryElement = library.element;
-
     emitStaticFunctions(library.statics);
 
-    ClassBuilder libraryBuilder = getElementDescriptor(libraryElement);
-    for (Class cls in library.classes) {
-      emitClass(cls, libraryBuilder);
+    Iterable<ClassElement> classes =
+        library.classes.map((Class cls) => cls.element);
+    for (ClassElement element in classes) {
+      generateClass(element, getElementDescriptor(element));
     }
 
-    classEmitter.emitFields(libraryElement, libraryBuilder, emitStatics: true);
+    LibraryElement libraryElement = library.element;
+    ClassBuilder builder = getElementDescriptor(libraryElement);
+    classEmitter.emitFields(library.element, builder, emitStatics: true);
   }
 
   void emitMainOutputUnit(Program program,
                           Map<OutputUnit, String> deferredLoadHashes,
                           CodeBuffer nativeBuffer) {
     Fragment mainFragment = program.fragments.first;
     OutputUnit mainOutputUnit = mainFragment.outputUnit;
 
     LineColumnCollector lineColumnCollector;
     List<CodeOutputListener> codeOutputListeners;
@@ skipping 702 matching lines @@
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isInstanceMember) {
         cachedClassBuilders.remove(element.enclosingClass);
 
         nativeEmitter.cachedBuilders.remove(element.enclosingClass);
 
       }
     }
   }
 }