Add TypeUse.

pkg/compiler/lib/src/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 'common.dart';
 import 'common/backend_api.dart' show
     Backend;
 import 'common/tasks.dart' show
@@ skipping 30 matching lines @@
 import 'tree/tree.dart' as ast;
 import 'tree/tree.dart' show
     Import,
     LibraryTag,
     LibraryDependency,
     LiteralDartString,
     LiteralString,
     NewExpression,
     Node;
 import 'universe/use.dart' show
-    StaticUse;
+    StaticUse,
+    TypeUse,
+    TypeUseKind;
 import 'universe/world_impact.dart' show
     WorldImpact;
 import 'util/setlet.dart' show
     Setlet;
 import 'util/uri_extras.dart' as uri_extras;
 import 'util/util.dart' show
     Link, makeUnique;
 
 /// A "hunk" of the program that will be loaded whenever one of its [imports]
 /// are loaded.
@@ skipping 249 matching lines @@
         if (!compiler.enqueuer.resolution.hasBeenProcessed(analyzableElement)) {
           return;
         }
 
         WorldImpact worldImpact =
             compiler.resolution.getWorldImpact(analyzableElement);
         worldImpact.staticUses.forEach((StaticUse staticUse) {
           elements.add(staticUse.element);
         });
         elements.addAll(worldImpact.closures);
-        for (DartType type in worldImpact.typeLiterals) {
-          if (type.isTypedef || type.isInterfaceType) {
-            elements.add(type.element);
+        for (TypeUse typeUse in worldImpact.typeUses) {
+          DartType type = typeUse.type;
+          switch (typeUse.kind) {
+            case TypeUseKind.TYPE_LITERAL:
+              if (type.isTypedef || type.isInterfaceType) {
+                elements.add(type.element);
+              }
+              break;
+            case TypeUseKind.INSTANTIATION:
+            case TypeUseKind.IS_CHECK:
+            case TypeUseKind.AS_CAST:
+            case TypeUseKind.CATCH_TYPE:
+              collectTypeDependencies(type);
+              break;
+            case TypeUseKind.CHECKED_MODE_CHECK:
+              if (compiler.enableTypeAssertions) {
+                collectTypeDependencies(type);
+              }
+              break;
           }
         }
-        worldImpact.instantiatedTypes.forEach(collectTypeDependencies);
-        worldImpact.isChecks.forEach(collectTypeDependencies);
-        worldImpact.asCasts.forEach(collectTypeDependencies);
-        worldImpact.onCatchTypes.forEach(collectTypeDependencies);
-        if (compiler.enableTypeAssertions) {
-          worldImpact.checkedModeChecks.forEach(collectTypeDependencies);
-        }
 
         TreeElements treeElements = analyzableElement.resolvedAst.elements;
         assert(treeElements != null);
 
         treeElements.forEachConstantNode((Node node, _) {
           // Explicitly depend on the backend constants.
           ConstantValue value =
               backend.constants.getConstantValueForNode(node, treeElements);
           if (value != null) {
             // TODO(johnniwinther): Assert that all constants have values when
@@ skipping 643 matching lines @@
     return result;
   }
 
   bool operator ==(other) {
     if (other is! _DeclaredDeferredImport) return false;
     return declaration == other.declaration;
   }
 
   int get hashCode => declaration.hashCode * 17;
 }