Fix deferred loading with multiple apps on same page.

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 139 matching lines @@
 
   String get finishIsolateConstructorName
       => '${namer.isolateName}.\$finishIsolateConstructor';
   String get isolatePropertiesName
       => '${namer.isolateName}.${namer.isolatePropertiesName}';
   String get lazyInitializerProperty
       => r'$lazy';
   String get lazyInitializerName
       => '${namer.isolateName}.${lazyInitializerProperty}';
   String get initName => 'init';
+  String get deferredInitializedName => 'deferredInitialized';
+
   String get makeConstListProperty
       => namer.getMappedInstanceName('makeConstantList');
 
   /// The name of the property that contains all field names.
   ///
   /// This property is added to constructors when isolate support is enabled.
   static const String FIELD_NAMES_PROPERTY_NAME = r"$__fields__";
 
   /// For deferred loading we communicate the initializers via this global var.
   final String deferredInitializers = r"$dart_deferred_initializers";
@@ skipping 1650 matching lines @@
     }
     return elementDescriptors.putIfAbsent(
         owner,
         () => new ClassBuilder(owner, namer));
   }
 
   /// Emits support-code for deferred loading into [buffer].
   void emitDeferredBoilerPlate(CodeBuffer buffer,
                                Map<OutputUnit, String> deferredLoadHashes) {
     // Function for checking if a hunk is loaded given its hash.
     buffer.write(jsAst.prettyPrint(

[floitsch, 2015/01/07 13:04:31]

Put all these statements together into one string.

buffer.write(jsAst.prettyPrint(js.statement('''
#isHunkLoaded = ...
#... = ...
#...

[sigurdm, 2015/01/07 13:37:13]

Done.

-        js('# = function(hunkHash) {'
+        js.statement('# = function(hunkHash) {'
            '  return !!$deferredInitializers[hunkHash];'
-           '}', generateEmbeddedGlobalAccess(embeddedNames.IS_HUNK_LOADED)),
+           '};', generateEmbeddedGlobalAccess(embeddedNames.IS_HUNK_LOADED)),
         compiler, monitor: compiler.dumpInfoTask));
-    buffer.write('$N');
+    buffer.write(jsAst.prettyPrint(
+        js.statement('$initName.$deferredInitializedName = new Object(null);'),

[floitsch, 2015/01/07 13:04:31]

this looks like a bad "initName" of an embedded global. These are deprecated.

[sigurdm, 2015/01/07 13:37:13]

Changed it to an embedded global.

+        compiler, monitor: compiler.dumpInfoTask));
+    // Function for checking if a hunk is initialized given its hash.
+    buffer.write(jsAst.prettyPrint(
+        js.statement('# = function(hunkHash) {'
+             'return $initName.$deferredInitializedName[hunkHash];'
+           '};',
+           generateEmbeddedGlobalAccess(embeddedNames.IS_HUNK_INITIALIZED)),
+        compiler, monitor: compiler.dumpInfoTask));
     // Function for initializing a loaded hunk, given its hash.
     buffer.write(jsAst.prettyPrint(
-        js('# = function(hunkHash) {'
-           '  $deferredInitializers[hunkHash]('
-                '$globalsHolder, ${namer.currentIsolate})'
-           '}',
+        js.statement('# = function(hunkHash) {'
+             '$deferredInitializers[hunkHash]('
+               '$globalsHolder, ${namer.currentIsolate});'
+             '$initName.deferredInitialized[hunkHash] = true;'
+           '};',
            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 =
         new Map<String, List<String>>();
     Map<String, List<String>> deferredLibraryHashes =
         new Map<String, List<String>>();
     compiler.deferredLoadTask.hunksToLoad.forEach(
                   (String loadId, List<OutputUnit>outputUnits) {
@@ skipping 172 matching lines @@
     for (Element element in compiler.enqueuer.codegen.newlyEnqueuedElements) {
       if (element.isInstanceMember) {
         cachedClassBuilders.remove(element.enclosingClass);
 
         nativeEmitter.cachedBuilders.remove(element.enclosingClass);
 
       }
     }
   }
 }