dart2js: remove first argument from lazy function.

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 836 matching lines @@
   }
 
   void emitLazilyInitializedStaticFields(CodeOutput output) {
     JavaScriptConstantCompiler handler = backend.constants;
     List<VariableElement> lazyFields =
         handler.getLazilyInitializedFieldsForEmission();
     if (!lazyFields.isEmpty) {
       needsLazyInitializer = true;
       for (VariableElement element in Elements.sortedByPosition(lazyFields)) {
         jsAst.Expression init =
-            buildLazilyInitializedStaticField(element, isolateProperties);
+            buildLazilyInitializedStaticField(element);
         if (init == null) continue;
         output.addBuffer(
             jsAst.prettyPrint(init, compiler, monitor: compiler.dumpInfoTask));
         output.add("$N");
       }
     }
   }
 
   jsAst.Expression buildLazilyInitializedStaticField(
-      VariableElement element, String isolateProperties) {
+      VariableElement element, {String isolateProperties}) {
     jsAst.Expression code = backend.generatedCode[element];
     // The code is null if we ended up not needing the lazily
     // initialized field after all because of constant folding
     // before code generation.
     if (code == null) return null;
     // The code only computes the initial value. We build the lazy-check
     // here:
     //   lazyInitializer(prototype, 'name', fieldName, getterName, initial);
     // The name is used for error reporting. The 'initial' must be a
     // closure that constructs the initial value.
-    return js('#(#,#,#,#,#)',
+    if (isolateProperties != null) {
+      return js('#(#,#,#,#,#)',
+          [js(lazyInitializerName),
+           js.string(element.name),
+           js.string(namer.globalPropertyName(element)),
+           js.string(namer.lazyInitializerName(element)),
+           code,
+           isolateProperties]);
+    }
+
+    return js('#(#,#,#,#)',
         [js(lazyInitializerName),
-            js(isolateProperties),
-            js.string(element.name),
-            js.string(namer.globalPropertyName(element)),
-            js.string(namer.lazyInitializerName(element)),
-            code]);
+         js.string(element.name),
+         js.string(namer.globalPropertyName(element)),
+         js.string(namer.lazyInitializerName(element)),
+         code]);
   }
 
   void emitMetadata(Program program, CodeOutput output) {
 
    addMetadataGlobal(List<String> list, String global) {
      String globalAccess = generateEmbeddedGlobalAccessString(global);
      output.add('$globalAccess$_=$_[');
      for (String data in list) {
        if (data is String) {
          if (data != 'null') {
@@ skipping 96 matching lines @@
 
     output.add(';');
     addComment('BEGIN invoke [main].', output);
     output.addBuffer(jsAst.prettyPrint(invokeMain,
                      compiler, monitor: compiler.dumpInfoTask));
     output.add(N);
     addComment('END invoke [main].', output);
   }
 
   void emitInitFunction(CodeOutput output) {
-    String isolate = namer.currentIsolate;
     jsAst.Expression allClassesAccess =
         generateEmbeddedGlobalAccess(embeddedNames.ALL_CLASSES);
     jsAst.Expression getTypeFromNameAccess =
         generateEmbeddedGlobalAccess(embeddedNames.GET_TYPE_FROM_NAME);
     jsAst.Expression interceptorsByTagAccess =
         generateEmbeddedGlobalAccess(embeddedNames.INTERCEPTORS_BY_TAG);
     jsAst.Expression leafTagsAccess =
         generateEmbeddedGlobalAccess(embeddedNames.LEAF_TAGS);
     jsAst.Expression finishedClassesAccess =
         generateEmbeddedGlobalAccess(embeddedNames.FINISHED_CLASSES);
     jsAst.Expression cyclicThrow =
         staticFunctionAccess(backend.getCyclicThrowHelper());
     jsAst.Expression laziesAccess =
         generateEmbeddedGlobalAccess(embeddedNames.LAZIES);
 
     jsAst.FunctionDeclaration decl = js.statement('''
       function init() {
         $isolateProperties = Object.create(null);
         #allClasses = Object.create(null);
         #getTypeFromName = function(name) {return #allClasses[name];};
         #interceptorsByTag = Object.create(null);
         #leafTags = Object.create(null);
         #finishedClasses = Object.create(null);
 
         if (#needsLazyInitializer) {

[herhut, 2015/03/25 14:23:14]

Please add a comment here that explains the special handling of prototype.

[zarah, 2015/03/25 14:46:04]

Done.

-          $lazyInitializerName = function (prototype, staticName, fieldName,
-                                           getterName, lazyValue) {
+          $lazyInitializerName = function (staticName, fieldName, getterName,
+                                           lazyValue, prototype) {
             if (!#lazies) #lazies = Object.create(null);
             #lazies[fieldName] = getterName;
 
+            prototype = prototype || $isolateProperties;
             var sentinelUndefined = {};
             var sentinelInProgress = {};
             prototype[fieldName] = sentinelUndefined;
 
             prototype[getterName] = function () {
-              var result = $isolate[fieldName];
+              var result = this[fieldName];
               try {
                 if (result === sentinelUndefined) {
-                  $isolate[fieldName] = sentinelInProgress;
+                  this[fieldName] = sentinelInProgress;
 
                   try {
-                    result = $isolate[fieldName] = lazyValue();
+                    result = this[fieldName] = lazyValue();
                   } finally {
                     // Use try-finally, not try-catch/throw as it destroys the
                     // stack trace.
                     if (result === sentinelUndefined)
-                      $isolate[fieldName] = null;
+                      this[fieldName] = null;
                   }
                 } else {
                   if (result === sentinelInProgress)
                     #cyclicThrow(staticName);
                 }
 
                 return result;
               } finally {
-                $isolate[getterName] = function() { return this[fieldName]; };
+                this[getterName] = function() { return this[fieldName]; };
               }
             }
           }
         }
 
         // We replace the old Isolate function with a new one that initializes
         // all its fields with the initial (and often final) value of all
         // globals.
         //
         // We also copy over old values like the prototype, and the
@@ skipping 1060 matching lines @@
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isInstanceMember) {
         cachedClassBuilders.remove(element.enclosingClass);
 
         nativeEmitter.cachedBuilders.remove(element.enclosingClass);
 
       }
     }
   }
 }