dart2js: Fast fix for deferred globals.

sdk/lib/_internal/compiler/implementation/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 1730 matching lines @@
     // Function for checking if a hunk is loaded given its hash.
     buffer.write(jsAst.prettyPrint(
         js('# = function(hunkHash) {'
            '  return !!$deferredInitializers[hunkHash];'
            '}', generateEmbeddedGlobalAccess(embeddedNames.IS_HUNK_LOADED)),
         compiler, monitor: compiler.dumpInfoTask));
     buffer.write('$N');
     // Function for initializing a loaded hunk, given its hash.
     buffer.write(jsAst.prettyPrint(
         js('# = function(hunkHash) {'
-           '  $deferredInitializers[hunkHash]($globalsHolder)'
+           '  $deferredInitializers[hunkHash]('
+                '$globalsHolder, ${namer.currentIsolate})'
            '}',
            generateEmbeddedGlobalAccess(
                embeddedNames.INITIALIZE_LOADED_HUNK)),
         compiler, monitor: compiler.dumpInfoTask));
     buffer.write('$N');
     // Write a javascript mapping from Deferred import load ids (derrived
     // from the import prefix.) to a list of lists of uris of hunks to load,
     // and a corresponding mapping to a list of hashes used by
     // INITIALIZE_LOADED_HUNK and IS_HUNK_LOADED.
     Map<String, List<String>> deferredLibraryUris =
@@ skipping 66 matching lines @@
       outputBuffer
           ..write('var init$_=$_${globalsHolder}.init$N')
           ..write('var ${namer.isolateName}$_=$_'
                     '${globalsHolder}.${namer.isolateName}$N');
       if (libraryDescriptorBuffer != null) {
       // TODO(ahe): This defines a lot of properties on the
       // Isolate.prototype object.  We know this will turn it into a
       // slow object in V8, so instead we should do something similar
       // to Isolate.$finishIsolateConstructor.
          outputBuffer
            ..write('var ${namer.currentIsolate}$_=$_$isolatePropertiesName$N')

[floitsch, 2014/10/10 22:12:21]

This is, where we set the namer.currentIsolate variable to the
isolate-properties (reusing the short name we reserve for the current isolate).

            // The classesCollector object ($$).
            ..write('$classesCollector$_=${_}Object.create(null);$n')
            ..write('(')
            ..write(
                jsAst.prettyPrint(
                    getReflectionDataParser(classesCollector, backend),
                    compiler, monitor: compiler.dumpInfoTask))
            ..write(')')
            ..write('([$n')
            ..addBuffer(libraryDescriptorBuffer)
            ..write('])$N');
 
         if (outputClassLists.containsKey(outputUnit)) {
           outputBuffer.write(
               '$finishClassesName($classesCollector,$_${namer.currentIsolate},'
               '$_$isolatePropertiesName)$N');
         }
 
       }
 
       classesCollector = oldClassesCollector;
 
+      // Set the currentIsolate variable to the current isolate (which is
+      // provided as second argument).
+      // We need to do this, because we use the same variable for setting up
+      // the isolate-properties and for storing the current isolate. During
+      // the setup (the code above this lines) we must set the variable to
+      // the isolate-properties.
+      // After we have done the setup (finishing with `finishClasses`) it must
+      // point to the current Isolate. Otherwise all methods/functions
+      // accessing isolate variables will access the wrong object.
+      outputBuffer.write("${namer.currentIsolate}$_=${_}arguments[1]$N");
       typeTestEmitter.emitRuntimeTypeSupport(outputBuffer, outputUnit);
 
       emitCompileTimeConstants(outputBuffer, outputUnit);
       outputBuffer.write('}$N');
 
       if (compiler.useContentSecurityPolicy) {
         jsAst.FunctionDeclaration precompiledFunctionAst =
             buildCspPrecompiledFunctionFor(outputUnit);
 
         outputBuffer.write(
@@ skipping 51 matching lines @@
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isInstanceMember) {
         cachedClassBuilders.remove(element.enclosingClass);
 
         nativeEmitter.cachedBuilders.remove(element.enclosingClass);
 
       }
     }
   }
 }