Ignore unused classes when constructing set for deferred loading.

sdk/lib/_internal/compiler/implementation/deferred_load.dart

 // Copyright (c) 2013, 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 'dart:collection'
        show LinkedHashMap,
             LinkedHashSet;
 
@@ skipping 65 matching lines @@
       if (deferredLibraries.isEmpty) return;
 
       // TODO(ahe): Enforce the following invariants on
       // [deferredElements] and [eagerElements]:
       // 1. Only static or top-level elements are recorded.
       // 2. Only implementation is stored.
       Map<LibraryElement, Set<Element>> deferredElements =
           new LinkedHashMap<LibraryElement, Set<Element>>();
       Set<Element> eagerElements = new LinkedHashSet<Element>();
 
-      // Iterate through the local members of the main script.  Create
+      // Iterate through live local members of the main script.  Create
       // a root-set of elements that must be loaded eagerly
       // (everything that is directly referred to from the main
       // script, but not imported from a deferred library), as well as
       // root-sets for deferred libraries.
       mainApp.forEachLocalMember((Element e) {
-        for (Element dependency in allElementsResolvedFrom(e)) {
-          if (isExplicitlyDeferred(dependency)) {
-            Set<Element> deferredElementsFromLibrary =
-                deferredElements.putIfAbsent(
-                    dependency.getLibrary(),
-                    () => new LinkedHashSet<Element>());
-            deferredElementsFromLibrary.add(dependency);
-          } else if (dependency.getLibrary() != mainApp) {
-            eagerElements.add(dependency.implementation);
+        if (compiler.enqueuer.resolution.isLive(e)) {
+          for (Element dependency in allElementsResolvedFrom(e)) {
+            if (isExplicitlyDeferred(dependency)) {
+              Set<Element> deferredElementsFromLibrary =
+                  deferredElements.putIfAbsent(
+                      dependency.getLibrary(),
+                      () => new LinkedHashSet<Element>());
+              deferredElementsFromLibrary.add(dependency);
+            } else if (dependency.getLibrary() != mainApp) {
+              eagerElements.add(dependency.implementation);
+            }
           }
         }
       });
 
       // Also add "global" dependencies to the eager root-set.  These
       // are things that the backend need but cannot associate with a
       // particular element, for example, startRootIsolate.  This set
       // also contains elements for which we lack precise information.
       eagerElements.addAll(compiler.globalDependencies.otherDependencies);
 
@@ skipping 35 matching lines @@
       // When instantiating a class, we record a reference to the
       // constructor, not the class itself.  We must add all the
       // instance members of the constructor's class (see below).
       result.addAll(
           allElementsResolvedFrom(element.getEnclosingClass().implementation));
     }
     if (element.isClass()) {
       // If we see a class, add everything its instance members refer
       // to.  Static members are not relevant.
       ClassElement cls = element.declaration;
-      cls.forEachLocalMember((Element e) {
-        if (!e.isInstanceMember()) return;
-        result.addAll(DependencyCollector.collect(e.implementation, compiler));
-      });
-      if (cls.implementation != cls) {
-        // TODO(ahe): Why doesn't ClassElement.forEachLocalMember do this?
-        cls.implementation.forEachLocalMember((Element e) {
+      // Make sure that class has been used - type has been computed.
+      if (cls.thisType != null) {

[ahe, 2013/08/08 11:36:51]

Can you revert this part of the change now?

+        cls.forEachLocalMember((Element e) {
           if (!e.isInstanceMember()) return;
-          result.addAll(DependencyCollector.collect(e.implementation,
-                                                    compiler));
+          result.addAll(DependencyCollector.collect(e.implementation, compiler));
         });
+        if (cls.implementation != cls) {
+          // TODO(ahe): Why doesn't ClassElement.forEachLocalMember do this?
+          cls.implementation.forEachLocalMember((Element e) {
+            if (!e.isInstanceMember()) return;
+            result.addAll(DependencyCollector.collect(e.implementation,
+                                                      compiler));
+          });
+        }
+        for (var type in cls.allSupertypes) {
+          result.add(type.element.implementation);
+        }
+        result.add(cls.implementation);
       }
-      for (var type in cls.allSupertypes) {
-        result.add(type.element.implementation);
-      }
-      result.add(cls.implementation);
     } else if (Elements.isStaticOrTopLevel(element)
                || element.isConstructor()) {
       result.addAll(DependencyCollector.collect(element, compiler));
     }
     // Other elements, in particular instance members, are ignored as
     // they are processed as part of the class.
     return result;
   }
 
   void addTransitiveClosureTo(Set<Element> elements) {
@@ skipping 60 matching lines @@
         compiler.enqueuer.resolution.getCachedElements(element);
     if (elements == null) return new LinkedHashSet<Element>();
     Node node = element.parseNode(compiler);
     if (node == null) return new LinkedHashSet<Element>();
     var collector = new DependencyCollector(elements, compiler);
     node.accept(collector);
     collector.dependencies.addAll(elements.otherDependencies);
     return collector.dependencies;
   }
 }