Revert "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 857 matching lines @@
     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('#(#,#,#,#)',
+    return js('#(#,#,#,#,#)',
         [js(lazyInitializerName),
+            js(isolateProperties),
             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);
@@ skipping 126 matching lines @@
     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) {
-          $lazyInitializerName = function (staticName, fieldName,
+          $lazyInitializerName = function (prototype, staticName, fieldName,
                                            getterName, lazyValue) {
             if (!#lazies) #lazies = Object.create(null);
             #lazies[fieldName] = getterName;
 
             var sentinelUndefined = {};
             var sentinelInProgress = {};
-            $isolateProperties[fieldName] = sentinelUndefined;
+            prototype[fieldName] = sentinelUndefined;
 
-            $isolateProperties[getterName] = function () {
-              var result = this[fieldName];
+            prototype[getterName] = function () {
+              var result = $isolate[fieldName];
               try {
                 if (result === sentinelUndefined) {
-                  this[fieldName] = sentinelInProgress;
+                  $isolate[fieldName] = sentinelInProgress;
 
                   try {
-                    result = this[fieldName] = lazyValue();
+                    result = $isolate[fieldName] = lazyValue();
                   } finally {
                     // Use try-finally, not try-catch/throw as it destroys the
                     // stack trace.
                     if (result === sentinelUndefined)
-                      this[fieldName] = null;
+                      $isolate[fieldName] = null;
                   }
                 } else {
                   if (result === sentinelInProgress)
                     #cyclicThrow(staticName);
                 }
 
                 return result;
               } finally {
-                this[getterName] = function() { return this[fieldName]; };
+                $isolate[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);
 
       }
     }
   }
 }