Avoid resetting collectors when calling finnishClasses from deferred.

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 285 matching lines @@
     // Declare a function called "generateAccessor".  This is used in
     // defineClassFunction (it's a local declaration in init()).
     return [
         generateAccessorFunction,
         js('$generateAccessorHolder = generateAccessor'),
         new jsAst.FunctionDeclaration(
             new jsAst.VariableDeclaration('defineClass'), defineClass) ];
   }
 
   /** Needs defineClass to be defined. */
-  List buildInheritFrom() {
-    return [js(r'''
+  jsAst.Expression buildInheritFrom() {
+    return js(r'''
         var inheritFrom = function() {
           function tmp() {}
           var hasOwnProperty = Object.prototype.hasOwnProperty;
           return function (constructor, superConstructor) {
             tmp.prototype = superConstructor.prototype;
             var object = new tmp();
             var properties = constructor.prototype;
             for (var member in properties) {
               if (hasOwnProperty.call(properties, member)) {
                 object[member] = properties[member];
               }
             }
             object.constructor = constructor;
             constructor.prototype = object;
             return object;
           };
         }()
-      ''')];
+      ''');
+  }
+
+  /// Code that needs to be run before first invocation of
+  /// [finishClassesFunction], but should only be run once.
+  jsAst.Expression get initFinishClasses {
+    jsAst.Expression allClassesAccess =
+        generateEmbeddedGlobalAccess(embeddedNames.ALL_CLASSES);
+    jsAst.Expression interceptorsByTagAccess =
+        generateEmbeddedGlobalAccess(embeddedNames.INTERCEPTORS_BY_TAG);
+    jsAst.Expression leafTagsAccess =
+        generateEmbeddedGlobalAccess(embeddedNames.LEAF_TAGS);
+    jsAst.Expression finishedClassesAccess =
+        generateEmbeddedGlobalAccess(embeddedNames.FINISHED_CLASSES);
+
+    return js('''
+        (function(){
+         # = Object.create(null);  // embedded allClasses.
+         # = Object.create(null);  // embedded interceptorsByTag.
+         # = Object.create(null);  // embedded leafTags.
+         # = Object.create(null);  // embedded finishedClasses
+        })()
+      ''', [allClassesAccess,
+            interceptorsByTagAccess,
+            leafTagsAccess,
+            finishedClassesAccess]);
   }
 
   List buildSplitOffAliases() {
     return [js(r'''
         var splitOffAliases = function(constructor) {
           var hasOwnProperty = Object.prototype.hasOwnProperty;
           var properties = constructor.prototype;
           for (var member in properties) {
             if (hasOwnProperty.call(properties, member)) {
               var s = member.split(':');
@@ skipping 19 matching lines @@
     //    constructor.
     // For engines where we have access to the '__proto__' we can manipulate
     // the object literal directly. For other engines we have to create a new
     // object and copy over the members.
 
     String reflectableField = namer.reflectableField;
     jsAst.Expression allClassesAccess =
         generateEmbeddedGlobalAccess(embeddedNames.ALL_CLASSES);
     jsAst.Expression metadataAccess =
         generateEmbeddedGlobalAccess(embeddedNames.METADATA);
-    jsAst.Expression interceptorsByTagAccess =
-        generateEmbeddedGlobalAccess(embeddedNames.INTERCEPTORS_BY_TAG);
-    jsAst.Expression leafTagsAccess =
-        generateEmbeddedGlobalAccess(embeddedNames.LEAF_TAGS);
+    jsAst.Expression finishedClassesAccess =
+        generateEmbeddedGlobalAccess(embeddedNames.FINISHED_CLASSES);
 
     return js('''
       function(collectedClasses, isolateProperties, existingIsolateProperties) {
         var pendingClasses = Object.create(null);
-        if (!#) # = Object.create(null);  // embedded allClasses.
         var allClasses = #;  // embedded allClasses;
+        var constructors;
 
         if (#)  // DEBUG_FAST_OBJECTS
           print("Number of classes: " +
               Object.getOwnPropertyNames(\$\$).length);
 
         var hasOwnProperty = Object.prototype.hasOwnProperty;
 
         if (typeof dart_precompiled == "function") {
-          var constructors = dart_precompiled(collectedClasses);
+          constructors = dart_precompiled(collectedClasses);
         } else {
           var combinedConstructorFunction =
              "function \$reflectable(fn){fn.$reflectableField=1;return fn};\\n"+
              "var \$desc;\\n";
           var constructorsList = [];
         }
 
         for (var cls in collectedClasses) {
           var desc = collectedClasses[cls];
           if (desc instanceof Array) desc = desc[1];
@@ skipping 74 matching lines @@
             desc = desc[1];
           }
           if (#) //backend.isTreeShakingDisabled,
             constructor["${namer.metadataField}"] = desc;
           allClasses[cls] = constructor;
           globalObject[cls] = constructor;
         }
 
         constructors = null;
 
-        var finishedClasses = Object.create(null);
-        # = Object.create(null);  // embedded interceptorsByTag.
-        # = Object.create(null);  // embedded leafTags.
+        var finishedClasses = #; // embedded finishedClasses
 
         #;  // buildFinishClass(),
 
         #;  // buildTrivialNsmHandlers()
 
         for (var cls in pendingClasses) finishClass(cls);
       }''', [
-          allClassesAccess, allClassesAccess,
           allClassesAccess,
           DEBUG_FAST_OBJECTS,
           backend.hasRetainedMetadata,
           metadataAccess,
           needsMixinSupport,
           backend.isTreeShakingDisabled,
-          interceptorsByTagAccess,
-          leafTagsAccess,
+          finishedClassesAccess,
           buildFinishClass(),
           nsmEmitter.buildTrivialNsmHandlers()]);
   }
 
   jsAst.Node optional(bool condition, jsAst.Node node) {
     return condition ? node : new jsAst.EmptyStatement();
   }
 
   jsAst.FunctionDeclaration buildFinishClass() {
     String specProperty = '"${namer.nativeSpecProperty}"';  // "%"
@@ skipping 181 matching lines @@
         }
       }
     ''', [laziesAccess, laziesAccess,
           laziesAccess,
           cyclicThrow]);
   }
 
   List buildDefineClassAndFinishClassFunctionsIfNecessary() {
     if (!needsDefineClass) return [];
     return defineClassFunction
-    ..addAll(buildInheritFrom())
+    ..add(buildInheritFrom())
     ..addAll(buildSplitOffAliases())
-    ..addAll([
-      js('$finishClassesName = #', finishClassesFunction)
-    ]);
+    ..add(js('$finishClassesName = #', finishClassesFunction))
+    ..add(initFinishClasses);
   }
 
   List buildLazyInitializerFunctionIfNecessary() {
     if (!needsLazyInitializer) return [];
 
     return [js('# = #', [js(lazyInitializerName), lazyInitializerFunction])];
   }
 
   List buildFinishIsolateConstructor() {
     return [
@@ skipping 1301 matching lines @@
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isInstanceMember) {
         cachedClassBuilders.remove(element.enclosingClass);
 
         nativeEmitter.cachedBuilders.remove(element.enclosingClass);
 
       }
     }
   }
 }