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;
 const REQUIRED_PARAMETER_INDEX = 3;
 const OPTIONAL_PARAMETER_INDEX = 4;
 const DEFAULT_ARGUMENTS_INDEX = 5;
 
 const bool VALIDATE_DATA = false;
 
 // TODO(zarah): Rename this when renaming this file.
 String get parseReflectionDataName => 'parseReflectionData';
 
-jsAst.Expression getReflectionDataParser(OldEmitter oldEmitter,
-                                         JavaScriptBackend backend,
-                                         bool needsNativeSupport) {
+jsAst.Statement getReflectionDataParser(OldEmitter oldEmitter,
+                                        JavaScriptBackend backend,
+                                        bool needsNativeSupport) {
   Namer namer = backend.namer;
   Compiler compiler = backend.compiler;
   CodeEmitterTask emitter = backend.emitter;
 
   String reflectableField = namer.reflectableField;
   String reflectionInfoField = namer.reflectionInfoField;
   String reflectionNameField = namer.reflectionNameField;
   String metadataIndexField = namer.metadataIndexField;
   String defaultValuesField = namer.defaultValuesField;
   String methodsWithOptionalArgumentsField =
@@ skipping 13 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 typesAccess =
       emitter.generateEmbeddedGlobalAccess(embeddedNames.TYPES);
 
+
   jsAst.Statement processClassData = js.statement('''{
+  function finishAddStubsHelper(prototype) {
+    var prototype = prototype || this;

[floitsch, 2015/03/11 13:59:33]

document this.

[herhut, 2015/03/13 12:28:52]

Done.

+    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;
+          // We have to filter out some special properties that are used for
+          // metadata in descriptors. Currently, we filter everything that 
+          // starts with + or *. This has to stay in sync with the special
+          // properties that are used by processClassData below.
+          if (property !== "${namer.classDescriptorProperty}" &&
+              property !== "$reflectableField" &&
+              firstChar !== 43 && // 43 is aka "+".
+              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) {
-    var newDesc = map(); // Use a slow object.
+    descriptor = convertToSlowObject(descriptor); // Use a slow object.
     var previousProperty;
     var properties = Object.keys(descriptor);
+    var hasDeferredWork = false;
+    var deferWork = supportsDirectProtoAccess && cls != #objectClassName;

[floitsch, 2015/03/11 13:59:33]

shouldDeferWork ?
shouldAddStubsEagerly = !...
shouldAddStubsLazily ?

[herhut, 2015/03/13 12:28:52]

Done.

     for (var i = 0; i < properties.length; i++) {
       var property = properties[i];
-      var firstChar = property.substring(0, 1);
+      var firstChar = property.charCodeAt(0);
       if (property === "static") {
-        processStatics(#embeddedStatics[cls] = descriptor[property],
+        processStatics(#embeddedStatics[cls] = descriptor.static,
                        processedClasses);
-      } else if (firstChar === "+") {
+        delete descriptor.static;
+      } else if (firstChar === 43) { // 43 is aka "+".

[floitsch, 2015/03/11 13:59:33]

is aka -> "is" or "aka".

[herhut, 2015/03/13 12:28:52]

Argh, missed that one. Thanks, done.

         mangledNames[previousProperty] = property.substring(1);
         var flag = descriptor[property];
         if (flag > 0)
           descriptor[previousProperty].$reflectableField = flag;
-      } else if (firstChar === "*") {
-        newDesc[previousProperty].$defaultValuesField = descriptor[property];
-        var optionalMethods = newDesc.$methodsWithOptionalArgumentsField;
+      } else if (firstChar === 42) { // 42 is "*"
+        descriptor[previousProperty].$defaultValuesField = descriptor[property];
+        var optionalMethods = descriptor.$methodsWithOptionalArgumentsField;
         if (!optionalMethods) {
-          newDesc.$methodsWithOptionalArgumentsField = optionalMethods={}
+          descriptor.$methodsWithOptionalArgumentsField = optionalMethods={}
         }
         optionalMethods[property] = previousProperty;
       } else {
         var elem = descriptor[property];
         if (property !== "${namer.classDescriptorProperty}" &&
             elem != null &&
             elem.constructor === Array &&
             property !== "<>") {
-          addStubs(newDesc, elem, property, false, []);
+          if (deferWork) {
+            hasDeferredWork = true;
+          } else {
+            addStubs(descriptor, elem, property, false, null);
+          }
         } else {
-          newDesc[previousProperty = property] = elem;
+          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 = newDesc["${namer.classDescriptorProperty}"],
+    var classData = descriptor["${namer.classDescriptorProperty}"],
         split, supr, fields = classData;
 
     if (#hasRetainedMetadata)
       if (typeof classData == "object" &&
           classData instanceof Array) {
         classData = fields = classData[0];
       }
     // ${ClassBuilder.fieldEncodingDescription}.
     var s = fields.split(";");
     fields = s[1] == "" ? [] : s[1].split(",");
     supr = s[0];
     // ${ClassBuilder.functionTypeEncodingDescription}.
     split = supr.split(":");
     if (split.length == 2) {
       supr = split[0];
       var functionSignature = split[1];
       if (functionSignature)
-        newDesc.${namer.operatorSignature} = function(s) {
+        descriptor.${namer.operatorSignature} = function(s) {
           return function() {
             return #types[s];
           };
         }(functionSignature);
     }
 
     if (supr) processedClasses.pending[cls] = supr;
     if (#notInCspMode) {
       processedClasses.combinedConstructorFunction += defineClass(cls, fields);
       processedClasses.constructorsList.push(cls);
     }
-    processedClasses.collected[cls] = [globalObject, newDesc];
+    processedClasses.collected[cls] = [globalObject, descriptor];
     classes.push(cls);
   }
-}''', {'embeddedStatics': staticsAccess,
+}''', {'deferredAction': namer.deferredAction,
+       'deferredActionString': js.string(namer.deferredAction),
+       'embeddedStatics': staticsAccess,
        'hasRetainedMetadata': backend.hasRetainedMetadata,
+       'markerFun': oldEmitter.markerFun,
        'types': typesAccess,
-       'notInCspMode': !compiler.useContentSecurityPolicy});
+       'notInCspMode': !compiler.useContentSecurityPolicy,
+       'objectClassName':
+         js.string(namer.runtimeTypeName(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.substring(0, 1);
+        var firstChar = property.charCodeAt(0);
         var previousProperty;
-        if (firstChar === "+") {
+        if (firstChar === 43) { // 43 is "+".
           mangledGlobalNames[previousProperty] = property.substring(1);
           var flag = descriptor[property];
           if (flag > 0)
             descriptor[previousProperty].$reflectableField = flag;
           if (element && element.length)
             #typeInformation[previousProperty] = element;
-        } else if (firstChar === "*") {
+        } else if (firstChar === 42) { // 42 is "*"
           globalObject[previousProperty].$defaultValuesField = element;
           var optionalMethods = descriptor.$methodsWithOptionalArgumentsField;
           if (!optionalMethods) {
             descriptor.$methodsWithOptionalArgumentsField = optionalMethods = {}
           }
           optionalMethods[property] = previousProperty;
         } else if (typeof element === "function") {
           globalObject[previousProperty = property] = element;
           functions.push(property);
           #globalFunctions[property] = element;
@@ skipping 14 matching lines @@
       'globalFunctions': globalFunctionsAccess,
       'hasClasses': oldEmitter.needsClassSupport,
       'needsStructuredMemberInfo': oldEmitter.needsStructuredMemberInfo});
 
 
   /**
    * See [dart2js.js_emitter.ContainerBuilder.addMemberMethod] for format of
    * [array].
    */
   jsAst.Statement addStubs = js.statement('''
   function addStubs(descriptor, array, name, isStatic, functions) {

[floitsch, 2015/03/11 13:59:33]

Since you seem to know what these arguments are, please add comments.
(In particular what "functions" is.

[herhut, 2015/03/13 12:28:52]

Done.

     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);

[floitsch, 2015/03/11 13:59:33]

Is this necessary in this CL?

[herhut, 2015/03/13 12:28:52]

Great catch. That was a left-over from an experiment.

     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 173 matching lines @@
        'precompiled': oldEmitter
            .generateEmbeddedGlobalAccess(embeddedNames.PRECOMPILED)});
 
   List<jsAst.Statement> incrementalSupport = <jsAst.Statement>[];
   if (compiler.hasIncrementalSupport) {
     incrementalSupport.add(
         js.statement(
             '#.addStubs = addStubs;', [namer.accessIncrementalHelper]));
   }
 
-  return js('''
+  return js.statement('''
 function $parseReflectionDataName(reflectionData) {
   "use strict";
   if (#needsClassSupport) {
     #defineClass;
     #inheritFrom;
     #finishClasses;
     #processClassData;
   }
   #processStatics;
   if (#needsStructuredMemberInfo) {
@@ skipping 43 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;
 })()''';
 }