Defer addStubs to class instantiation time.

pkg/compiler/lib/src/js_emitter/old_emitter/reflection_data_parser.dart

 // Copyright (c) 2013, 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;
 
 // TODO(ahe): Share these with js_helper.dart.
 const FUNCTION_INDEX = 0;
 const NAME_INDEX = 1;
 const CALL_NAME_INDEX = 2;
@@ skipping 35 matching lines @@
       emitter.generateEmbeddedGlobalAccess(embeddedNames.INTERCEPTED_NAMES);
   jsAst.Expression mangledGlobalNamesAccess =
       emitter.generateEmbeddedGlobalAccess(embeddedNames.MANGLED_GLOBAL_NAMES);
   jsAst.Expression mangledNamesAccess =
       emitter.generateEmbeddedGlobalAccess(embeddedNames.MANGLED_NAMES);
   jsAst.Expression librariesAccess =
       emitter.generateEmbeddedGlobalAccess(embeddedNames.LIBRARIES);
   jsAst.Expression metadataAccess =
       emitter.generateEmbeddedGlobalAccess(embeddedNames.METADATA);
 
+
   jsAst.Statement processClassData = js.statement('''{
+  function markerFun() {}
+  function finishAddStubsHelper(prototype) {
+    var prototype = prototype || this;
+    var object;
+    while (prototype.#deferredAction != markerFun) {
+      if (prototype.hasOwnProperty(#deferredActionString)) {
+        delete prototype.#deferredAction; // Intended to make it slow, too.
+        var properties = Object.keys(prototype);
+        for (var index = 0; index < properties.length; index++) {
+          var property = properties[index];
+          var firstChar = property.charCodeAt(0);
+          var elem;
+          if (property !== "${namer.classDescriptorProperty}" &&
+              property !== "$reflectableField" &&
+              firstChar !== 43 && // 43 is aka "+".

[floitsch, 2015/03/06 14:54:09]

Please add comment what this is for. The "+" and "*" are probably more
misleading to new readers.

[herhut, 2015/03/09 14:28:35]

Done.

+              firstChar !== 42 && // 42 is aka "*"
+              (elem = prototype[property]) != null &&
+              elem.constructor === Array &&
+              property !== "<>") {
+            addStubs(prototype, elem, property, false, null);
+          }
+        }
+        convertToFastObject(prototype);
+      }
+      prototype = prototype.__proto__;
+    }
+  }
+
   function processClassData(cls, descriptor, processedClasses) {
     descriptor = convertToSlowObject(descriptor); // Use a slow object.
     var previousProperty;
     var properties = Object.keys(descriptor);
+    var hasDeferredWork = false;
+    var deferWork = supportsDirectProtoAccess && cls != #objectClassName;
     for (var i = 0; i < properties.length; i++) {
       var property = properties[i];
       var firstChar = property.charCodeAt(0);
       if (property === "static") {
         processStatics(#embeddedStatics[cls] = descriptor.static,
                        processedClasses);
+        delete descriptor.static;

[floitsch, 2015/03/06 14:54:09]

we don't need it for reflection?

[herhut, 2015/03/09 14:28:35]

No, statics are collected separately in an array that is then used by the
mirrors runtime. 

       } else if (firstChar === 43) { // 43 is aka "+".
         mangledNames[previousProperty] = property.substring(1);
         var flag = descriptor[property];
         if (flag > 0)
           descriptor[previousProperty].$reflectableField = flag;
       } else if (firstChar === 42) { // 42 is aka "*"
         descriptor[previousProperty].$defaultValuesField = descriptor[property];
         var optionalMethods = descriptor.$methodsWithOptionalArgumentsField;
         if (!optionalMethods) {
           descriptor.$methodsWithOptionalArgumentsField = optionalMethods={}
         }
         optionalMethods[property] = previousProperty;
       } else {
         var elem = descriptor[property];
         if (property !== "${namer.classDescriptorProperty}" &&
             elem != null &&
             elem.constructor === Array &&
             property !== "<>") {
-          addStubs(descriptor, elem, property, false, []);
+          if (deferWork) {
+            hasDeferredWork = true;
+          } else {
+            addStubs(descriptor, elem, property, false, null);
+          }
         } else {
           previousProperty = property;
         }
       }
     }
+    
+    if (hasDeferredWork)
+      descriptor.#deferredAction = finishAddStubsHelper;
 
     /* The 'fields' are either a constructor function or a
      * string encoding fields, constructor and superclass. Gets the
      * superclass and fields in the format
      *   'Super;field1,field2'
      * from the CLASS_DESCRIPTOR_PROPERTY property on the descriptor.
      */
     var classData = descriptor["${namer.classDescriptorProperty}"],
         split, supr, fields = classData;
 
@@ skipping 20 matching lines @@
     }
 
     if (supr) processedClasses.pending[cls] = supr;
     if (#notInCspMode) {
       processedClasses.combinedConstructorFunction += defineClass(cls, fields);
       processedClasses.constructorsList.push(cls);
     }
     processedClasses.collected[cls] = [globalObject, descriptor];
     classes.push(cls);
   }
-}''', {'embeddedStatics': staticsAccess,
+}''', {'deferredAction': namer.deferredAction,
+       'deferredActionString': js.string(namer.deferredAction),
+       'embeddedStatics': staticsAccess,
        'hasRetainedMetadata': backend.hasRetainedMetadata,
        'metadata': metadataAccess,
-       'notInCspMode': !compiler.useContentSecurityPolicy});
+       'notInCspMode': !compiler.useContentSecurityPolicy,
+       'objectClassName':
+         js.string(namer.getNameOfClass(compiler.objectClass))});
 
   // TODO(zarah): Remove empty else branches in output when if(#hole) is false.
   jsAst.Statement processStatics = js.statement('''
     function processStatics(descriptor, processedClasses) {
       var properties = Object.keys(descriptor);
       for (var i = 0; i < properties.length; i++) {
         var property = properties[i];
         if (property === "${namer.classDescriptorProperty}") continue;
         var element = descriptor[property];
         var firstChar = property.charCodeAt(0);
@@ skipping 43 matching lines @@
   function addStubs(descriptor, array, name, isStatic, functions) {
     var index = $FUNCTION_INDEX, alias = array[index], f;
     if (typeof alias == "string") {
       f = array[++index];
     } else {
       f = alias;
       alias = name;
     }
     var funcs = [descriptor[name] = descriptor[alias] = f];
     f.\$stubName = name;
-    functions.push(name);
+    if (isStatic) functions.push(name);
     for (; index < array.length; index += 2) {
       f = array[index + 1];
       if (typeof f != "function") break;
       f.\$stubName = ${readString("array", "index + 2")};
       funcs.push(f);
       if (f.\$stubName) {
         descriptor[f.\$stubName] = f;
-        functions.push(f.\$stubName);
+        if (isStatic) functions.push(f.\$stubName);
       }
     }
     index++;
     for (var i = 0; i < funcs.length; index++, i++) {
       funcs[i].\$callName = ${readString("array", "index")};
     }
     var getterStubName = ${readString("array", "index")};
     array = array.slice(++index);
     var requiredParameterInfo = ${readInt("array", "0")};
     var requiredParameterCount = requiredParameterInfo >> 1;
     var isAccessor = (requiredParameterInfo & 1) === 1;
     var isSetter = requiredParameterInfo === 3;
     var isGetter = requiredParameterInfo === 1;
     var optionalParameterInfo = ${readInt("array", "1")};
     var optionalParameterCount = optionalParameterInfo >> 1;
     var optionalParametersAreNamed = (optionalParameterInfo & 1) === 1;
     var isIntercepted =
            requiredParameterCount + optionalParameterCount != funcs[0].length;
     var functionTypeIndex = ${readFunctionType("array", "2")};
     var unmangledNameIndex = $unmangledNameIndex;
 
     if (getterStubName) {
       f = tearOff(funcs, array, isStatic, name, isIntercepted);
       descriptor[name].\$getter = f;
       f.\$getterStub = true;
       // Used to create an isolate using spawnFunction.
-      if (isStatic) #globalFunctions[name] = f;
+      if (isStatic) {
+        #globalFunctions[name] = f;
+        functions.push(getterStubName);
+      }
       descriptor[getterStubName] = f;
       funcs.push(f);
-      if (getterStubName) functions.push(getterStubName);
       f.\$stubName = getterStubName;
       f.\$callName = null;
       // Update the interceptedNames map (which only exists if `invokeOn` was
       // enabled).
       if (#enabledInvokeOn)
         if (isIntercepted) #interceptedNames[getterStubName] = 1;
     }
 
     if (#usesMangledNames) {
       var isReflectable = array.length > unmangledNameIndex;
@@ skipping 235 matching lines @@
 (function() {
   var result = $array[$index];
   if ($check) {
     throw new Error(
         name + ": expected value of type \'$type\' at index " + ($index) +
         " but got " + (typeof result));
   }
   return result;
 })()''';
 }