Revert "Load deferred chunks in the right order."

sdk/lib/_internal/compiler/implementation/deferred_load.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.
 
 library deferred_load;
 
 import 'dart2jslib.dart' show
     Compiler,
     CompilerTask,
     Constant,
@@ skipping 101 matching lines @@
   /// The OutputUnit that will be loaded when the program starts.
   final OutputUnit mainOutputUnit = new OutputUnit();
 
   /// A set containing (eventually) all output units that will result from the
   /// program.
   final Set<OutputUnit> allOutputUnits = new Set<OutputUnit>();
 
   /// Will be `true` if the program contains deferred libraries.
   bool splitProgram = false;
 
-  /// A mapping from the name of a defer import to all the output units it
-  /// depends on in a list of lists to be loaded in the order they appear.
-  ///
-  /// For example {"lib1": [[lib1_lib2_lib3], [lib1_lib2, lib1_lib3],
-  /// [lib1]]} would mean that in order to load "lib1" first the hunk
-  /// lib1_lib2_lib2 should be loaded, then the hunks lib1_lib2 and lib1_lib3
-  /// can be loaded in parallel. And finally lib1 can be loaded.
-  final Map<String, List<List<OutputUnit>>> hunksToLoad =
-      new Map<String, List<List<OutputUnit>>>();
+  /// A mapping from the name of a [DeferredLibrary] annotation to all dependent
+  /// output units.
+  final Map<String, Set<OutputUnit>> hunksToLoad =
+      new Map<String, Set<OutputUnit>>();
   final Map<Import, String> importDeferName = new Map<Import, String>();
 
   /// A mapping from elements and constants to their output unit. Query this via
   /// [outputUnitForElement]
   final Map<Element, OutputUnit> _elementToOutputUnit =
       new Map<Element, OutputUnit>();
 
   /// A mapping from constants to their output unit. Query this via
   /// [outputUnitForConstant]
   final Map<Constant, OutputUnit> _constantToOutputUnit =
@@ skipping 303 matching lines @@
               mirrorTask.analyzer.collectMirrorsUsedAnnotation();
 
           // If there is a MirrorsUsed annotation we add only the needed
           // things to the output units for the library.
           List<MirrorUsage> mirrorUsages = mirrorsResult[library];
           if (mirrorUsages == null) continue;
 
           void mapDependenciesIfResolved(Element element) {
             // If there is a target for this class, but no use of mirrors the
             // class will not be resolved. We just skip it.
-            if (element is ClassElement &&!element.isResolved) {
+            if (element is ClassElement &&
+                !(element as ClassElement).isResolved) {
               return;
             }
             _mapDependencies(element, deferredImport);
           }
 
           for (MirrorUsage usage in mirrorUsages) {
             if (usage.targets != null) {
               for (Element dependency in usage.targets) {
                 if (dependency.isLibrary()) {
                   LibraryElement library = dependency;
@@ skipping 160 matching lines @@
       generatedNames[outputUnit] = outputUnit.name;
     }
 
     for (Import import in _allDeferredImports.keys) {
       computeImportDeferName(import);
     }
 
     for (OutputUnit outputUnit in allOutputUnits) {
       computeOutputUnitName(outputUnit);
     }
-    List sortedOutputUnits = new List.from(allOutputUnits);
-    // Sort the output units in descending order of the number of imports they
-    // include.
-
-    // The loading of the output units mut be ordered because a superclass needs
-    // to be initialized before its subclass.
-    // But a class can only depend on another class in an output unit shared by
-    // a strict superset of the imports:
-    // By contradiction: Assume a class C in output unit shared by imports in
-    // the set S1 = (lib1,.., lib_n) depends on a class D in an output unit
-    // shared by S2 such that S2 not a superset of S1. Let lib_s be a library in
-    // S1 not in S2. lib_s must depend on C, and then in turn on D therefore D
-    // is not in the right output unit.
-    sortedOutputUnits.sort((a, b) => b.imports.length - a.imports.length);
 
     // For each deferred import we find out which outputUnits to load.
     for (Import import in _allDeferredImports.keys) {
       if (import == _fakeMainImport) continue;
-      hunksToLoad[importDeferName[import]] = new List<List<OutputUnit>>();
-      int lastNumberOfImports = 0;
-      List<OutputUnit> currentLastList;
-      for (OutputUnit outputUnit in sortedOutputUnits) {
+      hunksToLoad[importDeferName[import]] = new Set<OutputUnit>();
+      for (OutputUnit outputUnit in allOutputUnits) {
         if (outputUnit == mainOutputUnit) continue;
         if (outputUnit.imports.contains(import)) {
-          if (outputUnit.imports.length != lastNumberOfImports) {
-            lastNumberOfImports = outputUnit.imports.length;
-            currentLastList = new List<OutputUnit>();
-            hunksToLoad[importDeferName[import]].add(currentLastList);
-          }
-          currentLastList.add(outputUnit);
+          hunksToLoad[importDeferName[import]].add(outputUnit);
         }
       }
     }
   }
 
   void onResolutionComplete(FunctionElement main) {
     if (!splitProgram) {
       allOutputUnits.add(mainOutputUnit);
       return;
     }
@@ skipping 118 matching lines @@
     }
     if (splitProgram && compiler.backend is DartBackend) {
       // TODO(sigurdm): Implement deferred loading for dart2dart.
       splitProgram = false;
       compiler.reportInfo(
           lastDeferred,
           MessageKind.DEFERRED_LIBRARY_DART_2_DART);
     }
   }
 }