Add TypeUse.

pkg/compiler/lib/src/universe/world_impact.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.universe.world_impact;
 
 import '../dart_types.dart' show
     DartType,
     InterfaceType;
 import '../elements/elements.dart' show
     Element,
     LocalFunctionElement,
     MethodElement;
 import '../util/util.dart' show
     Setlet;
 
 import 'use.dart' show
     DynamicUse,
-    StaticUse;
+    StaticUse,
+    TypeUse;
 
 class WorldImpact {
   const WorldImpact();
 
   Iterable<DynamicUse> get dynamicUses =>
       const <DynamicUse>[];
 
   Iterable<StaticUse> get staticUses => const <StaticUse>[];
 
   // TODO(johnniwinther): Replace this by called constructors with type
   // arguments.
-  Iterable<InterfaceType> get instantiatedTypes => const <InterfaceType>[];
+  // TODO(johnniwinther): Collect all checked types for checked mode separately
+  // to support serialization.
 
-  // TODO(johnniwinther): Collect checked types for checked mode separately to
-  // support serialization.
-  Iterable<DartType> get isChecks => const <DartType>[];
-
-  Iterable<DartType> get checkedModeChecks => const <DartType>[];
-
-  Iterable<DartType> get asCasts => const <DartType>[];
-
-  Iterable<DartType> get onCatchTypes => const <DartType>[];
+  Iterable<TypeUse> get typeUses => const <TypeUse>[];
 
   Iterable<LocalFunctionElement> get closures => const <LocalFunctionElement>[];
 
-  Iterable<DartType> get typeLiterals => const <DartType>[];
-
   String toString() => dump(this);
 
   static String dump(WorldImpact worldImpact) {
     StringBuffer sb = new StringBuffer();
     printOn(sb, worldImpact);
     return sb.toString();
   }
 
   static void printOn(StringBuffer sb, WorldImpact worldImpact) {
     void add(String title, Iterable iterable) {
       if (iterable.isNotEmpty) {
         sb.write('\n $title:');
         iterable.forEach((e) => sb.write('\n  $e'));
       }
     }
 
     add('dynamic uses', worldImpact.dynamicUses);
     add('static uses', worldImpact.staticUses);
-    add('instantiated types', worldImpact.instantiatedTypes);
-    add('is-checks', worldImpact.isChecks);
-    add('checked-mode checks', worldImpact.checkedModeChecks);
-    add('as-casts', worldImpact.asCasts);
-    add('on-catch-types', worldImpact.onCatchTypes);
+    add('type uses', worldImpact.typeUses);
     add('closures', worldImpact.closures);
-    add('type literals', worldImpact.typeLiterals);
   }
 }
 
 class WorldImpactBuilder {
   // TODO(johnniwinther): Do we benefit from lazy initialization of the
   // [Setlet]s?
   Setlet<DynamicUse> _dynamicUses;
-  Setlet<InterfaceType> _instantiatedTypes;
   Setlet<StaticUse> _staticUses;
-  Setlet<DartType> _isChecks;
-  Setlet<DartType> _asCasts;
-  Setlet<DartType> _checkedModeChecks;
-  Setlet<DartType> _onCatchTypes;
+  Setlet<TypeUse> _typeUses;
   Setlet<LocalFunctionElement> _closures;
-  Setlet<DartType> _typeLiterals;
 
   void registerDynamicUse(DynamicUse dynamicUse) {
     assert(dynamicUse != null);
     if (_dynamicUses == null) {
       _dynamicUses = new Setlet<DynamicUse>();
     }
     _dynamicUses.add(dynamicUse);
   }
 
   Iterable<DynamicUse> get dynamicUses {
     return _dynamicUses != null
         ? _dynamicUses : const <DynamicUse>[];
   }
 
-  void registerInstantiatedType(InterfaceType type) {
-    assert(type != null);
-    if (_instantiatedTypes == null) {
-      _instantiatedTypes = new Setlet<InterfaceType>();
+  void registerTypeUse(TypeUse typeUse) {
+    assert(typeUse != null);
+    if (_typeUses == null) {
+      _typeUses = new Setlet<TypeUse>();
     }
-    _instantiatedTypes.add(type);
+    _typeUses.add(typeUse);
   }
 
-  Iterable<InterfaceType> get instantiatedTypes {
-    return _instantiatedTypes != null
-        ? _instantiatedTypes : const <InterfaceType>[];
-  }
-
-  void registerTypeLiteral(DartType type) {
-    assert(type != null);
-    if (_typeLiterals == null) {
-      _typeLiterals = new Setlet<DartType>();
-    }
-    _typeLiterals.add(type);
-  }
-
-  Iterable<DartType> get typeLiterals {
-    return _typeLiterals != null
-        ? _typeLiterals : const <DartType>[];
+  Iterable<TypeUse> get typeUses {
+    return _typeUses != null
+        ? _typeUses : const <TypeUse>[];
   }
 
   void registerStaticUse(StaticUse staticUse) {
     assert(staticUse != null);
     if (_staticUses == null) {
       _staticUses = new Setlet<StaticUse>();
     }
     _staticUses.add(staticUse);
   }
 
   Iterable<StaticUse> get staticUses {
     return _staticUses != null ? _staticUses : const <StaticUse>[];
   }
 
-  void registerIsCheck(DartType type) {
-    assert(type != null);
-    if (_isChecks == null) {
-      _isChecks = new Setlet<DartType>();
-    }
-    _isChecks.add(type);
-  }
-
-  Iterable<DartType> get isChecks {
-    return _isChecks != null
-        ? _isChecks : const <DartType>[];
-  }
-
-  void registerAsCast(DartType type) {
-    if (_asCasts == null) {
-      _asCasts = new Setlet<DartType>();
-    }
-    _asCasts.add(type);
-  }
-
-  Iterable<DartType> get asCasts {
-    return _asCasts != null
-        ? _asCasts : const <DartType>[];
-  }
-
-  void registerCheckedModeCheckedType(DartType type) {
-    if (_checkedModeChecks == null) {
-      _checkedModeChecks = new Setlet<DartType>();
-    }
-    _checkedModeChecks.add(type);
-  }
-
-  Iterable<DartType> get checkedModeChecks {
-    return _checkedModeChecks != null
-        ? _checkedModeChecks : const <DartType>[];
-  }
-
-  void registerOnCatchType(DartType type) {
-    assert(type != null);
-    if (_onCatchTypes == null) {
-      _onCatchTypes = new Setlet<DartType>();
-    }
-    _onCatchTypes.add(type);
-  }
-
-  Iterable<DartType> get onCatchTypes {
-    return _onCatchTypes != null
-        ? _onCatchTypes : const <DartType>[];
-  }
-
   void registerClosure(LocalFunctionElement element) {
     if (_closures == null) {
       _closures = new Setlet<LocalFunctionElement>();
     }
     _closures.add(element);
   }
 
   Iterable<LocalFunctionElement> get closures {
     return _closures != null
         ? _closures : const <LocalFunctionElement>[];
   }
 }
 
 /// Mutable implementation of [WorldImpact] used to transform
 /// [ResolutionImpact] or [CodegenImpact] to [WorldImpact].
 class TransformedWorldImpact implements WorldImpact {
   final WorldImpact worldImpact;
 
   Setlet<StaticUse> _staticUses;
-  Setlet<InterfaceType> _instantiatedTypes;
+  Setlet<TypeUse> _typeUses;
   Setlet<DynamicUse> _dynamicUses;
 
   TransformedWorldImpact(this.worldImpact);
 
   @override
-  Iterable<DartType> get asCasts => worldImpact.asCasts;
-
-  @override
-  Iterable<DartType> get checkedModeChecks => worldImpact.checkedModeChecks;
-
-  @override
   Iterable<DynamicUse> get dynamicUses {
     return _dynamicUses != null
         ? _dynamicUses : worldImpact.dynamicUses;
   }
 
-  @override
-  Iterable<DartType> get isChecks => worldImpact.isChecks;
-
-  @override
-  Iterable<DartType> get onCatchTypes => worldImpact.onCatchTypes;
-
-  _unsupported(String message) => throw new UnsupportedError(message);
-
   void registerDynamicUse(DynamicUse dynamicUse) {
     if (_dynamicUses == null) {
       _dynamicUses = new Setlet<DynamicUse>();
       _dynamicUses.addAll(worldImpact.dynamicUses);
     }
     _dynamicUses.add(dynamicUse);
   }
 
-  void registerInstantiatedType(InterfaceType type) {
-    if (_instantiatedTypes == null) {
-      _instantiatedTypes = new Setlet<InterfaceType>();
-      _instantiatedTypes.addAll(worldImpact.instantiatedTypes);
+  void registerTypeUse(TypeUse typeUse) {
+    if (_typeUses == null) {
+      _typeUses = new Setlet<TypeUse>();
+      _typeUses.addAll(worldImpact.typeUses);
     }
-    _instantiatedTypes.add(type);
+    _typeUses.add(typeUse);
   }
 
   @override
-  Iterable<InterfaceType> get instantiatedTypes {
-    return _instantiatedTypes != null
-        ? _instantiatedTypes : worldImpact.instantiatedTypes;
-  }
-
-  @override
-  Iterable<DartType> get typeLiterals {
-    return worldImpact.typeLiterals;
+  Iterable<TypeUse> get typeUses {
+    return _typeUses != null
+        ? _typeUses : worldImpact.typeUses;
   }
 
   void registerStaticUse(StaticUse staticUse) {
     if (_staticUses == null) {
       _staticUses = new Setlet<StaticUse>();
       _staticUses.addAll(worldImpact.staticUses);
     }
     _staticUses.add(staticUse);
   }
 
   @override
   Iterable<StaticUse> get staticUses {
     return _staticUses != null ? _staticUses : worldImpact.staticUses;
   }
 
   @override
   Iterable<LocalFunctionElement> get closures => worldImpact.closures;
 
   String toString() {
     StringBuffer sb = new StringBuffer();
     sb.write('TransformedWorldImpact($worldImpact)');
     WorldImpact.printOn(sb, this);
     return sb.toString();
   }
 }