Enqueue superclasses instead of supertypes.

pkg/compiler/lib/src/universe/class_set.dart

 // Copyright (c) 2015, 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 dart2js.world.class_set;
 
 import 'dart:collection' show IterableBase;
 import '../elements/elements.dart' show ClassElement;
 import '../util/util.dart' show Link;
 
@@ skipping 83 matching lines @@
        bool includeUninstantiated: true,
        bool strict: false}) {
     return new ClassHierarchyNodeIterable(
         this,
         includeRoot: !strict,
         includeDirectlyInstantiated: includeDirectlyInstantiated,
         includeIndirectlyInstantiated: includeIndirectlyInstantiated,
         includeUninstantiated: includeUninstantiated);
   }
 
-  void dump(StringBuffer sb, String indentation) {
-    sb.write('$indentation$cls:[');
+  void printOn(StringBuffer sb, String indentation,
+               {bool instantiatedOnly: false}) {
+    sb.write('$indentation$cls');
+    if (isDirectlyInstantiated) {
+      sb.write(' directly');
+    }
+    if (isIndirectlyInstantiated) {
+      sb.write(' indirectly');
+    }
+    sb.write(' [');
     if (_directSubclasses.isEmpty) {
       sb.write(']');
     } else {
-      sb.write('\n');
       bool needsComma = false;
       for (Link<ClassHierarchyNode> link = _directSubclasses;
            !link.isEmpty;
            link = link.tail) {
+        if (instantiatedOnly && !link.head.isInstantiated) {
+          continue;
+        }
         if (needsComma) {
           sb.write(',\n');
+        } else {
+          sb.write('\n');
         }
-        link.head.dump(sb, '$indentation  ');
+        link.head.printOn(
+            sb, '$indentation  ', instantiatedOnly: instantiatedOnly);
         needsComma = true;
       }
-      sb.write('\n');
-      sb.write('$indentation]');
+      if (needsComma) {
+        sb.write('\n');
+        sb.write('$indentation]');
+      } else {
+        sb.write(']');
+      }
     }
   }
 
+  String dump({String indentation: '', bool instantiatedOnly: false}) {
+    StringBuffer sb = new StringBuffer();
+    printOn(sb, indentation, instantiatedOnly: instantiatedOnly);
+    return sb.toString();
+  }
+
   String toString() => cls.toString();
 }
 
 /// Object holding the subclass and subtype relation for a single
 /// [ClassElement].
 ///
 /// The subclass relation for a class `C` is modelled through a reference to
 /// the [ClassHierarchyNode] for `C` in the global [ClassHierarchyNode] tree
 /// computed in [World].
 ///
@@ skipping 132 matching lines @@
       if (!added) {
         newSubtypes.add(subtype);
       }
       _directSubtypes = newSubtypes;
     }
   }
 
   String toString() {
     StringBuffer sb = new StringBuffer();
     sb.write('[\n');
-    node.dump(sb, '  ');
+    node.printOn(sb, '  ');
     sb.write('\n');
     if (_directSubtypes != null) {
       for (ClassHierarchyNode node in _directSubtypes) {
-        node.dump(sb, '  ');
+        node.printOn(sb, '  ');
         sb.write('\n');
       }
     }
     sb.write(']');
     return sb.toString();
   }
 }
 
 /// Iterable for subclasses of a [ClassHierarchyNode].
 class ClassHierarchyNodeIterable extends IterableBase<ClassElement> {
@@ skipping 177 matching lines @@
           includeDirectlyInstantiated: includeDirectlyInstantiated,
           includeIndirectlyInstantiated: includeIndirectlyInstantiated,
           includeUninstantiated: includeUninstantiated).iterator;
       if (elements.moveNext()) {
         return true;
       }
     }
     return false;
   }
 }