Refactor reifier to make it less dart_codegen specific.

test/dart_codegen/expect/collection/splay_tree.dart

Index: test/dart_codegen/expect/collection/splay_tree.dart
diff --git a/test/dart_codegen/expect/collection/splay_tree.dart b/test/dart_codegen/expect/collection/splay_tree.dart
index 4654593efdf57efeeda1688790d407730c92fa4c..b1a7c0b0a8887e4b116da93bf9a4281fbefb2848 100644
--- a/test/dart_codegen/expect/collection/splay_tree.dart
+++ b/test/dart_codegen/expect/collection/splay_tree.dart
@@ -147,9 +147,11 @@ _root = null;
 }
  class SplayTreeMap<K, V> extends _SplayTree<K> implements Map<K, V> {Comparator<K> _comparator;
  _Predicate _validKey;
- SplayTreeMap([int compare(K key1, K key2), bool isValidKey(potentialKey)]) : _comparator = ((__x15) => DEVC$RT.cast(__x15, dynamic, DEVC$RT.type((__t12<K> _) {
+ SplayTreeMap([int compare(K key1, K key2), bool isValidKey(potentialKey)]) : _comparator = ((__x12) => DEVC$RT.cast(__x12, dynamic, DEVC$RT.type((Comparator<K> _) {
 }
-), "CompositeCast", """line 268, column 23 of dart:collection/splay_tree.dart: """, __x15 is __t12<K>, false))((compare == null) ? Comparable.compare : compare), _validKey = ((__x18) => DEVC$RT.cast(__x18, dynamic, __t16, "CompositeCast", """line 269, column 21 of dart:collection/splay_tree.dart: """, __x18 is __t16, false))((isValidKey != null) ? isValidKey : ((v) => v is K));
+), "CompositeCast", """line 268, column 23 of dart:collection/splay_tree.dart: """, __x12 is Comparator<K>, false))((compare == null) ? Comparable.compare : compare), _validKey = ((__x13) => DEVC$RT.cast(__x13, dynamic, DEVC$RT.type((_Predicate<dynamic> _) {
+}
+), "CompositeCast", """line 269, column 21 of dart:collection/splay_tree.dart: """, __x13 is _Predicate<dynamic>, false))((isValidKey != null) ? isValidKey : ((v) => v is K));
  factory SplayTreeMap.from(Map other, [int compare(K key1, K key2), bool isValidKey(potentialKey)]) {
 SplayTreeMap<K, V> result = new SplayTreeMap<K, V>();
  other.forEach((k, v) {
@@ -190,11 +192,11 @@ _SplayTreeMapNode mapRoot = DEVC$RT.cast(_root, DEVC$RT.type((_SplayTreeNode<K>
 }
  V remove(Object key) {
 if (!_validKey(key)) return null;
- _SplayTreeMapNode mapRoot = ((__x19) => DEVC$RT.cast(__x19, DEVC$RT.type((_SplayTreeNode<dynamic> _) {
+ _SplayTreeMapNode mapRoot = ((__x14) => DEVC$RT.cast(__x14, DEVC$RT.type((_SplayTreeNode<dynamic> _) {
 }
 ), DEVC$RT.type((_SplayTreeMapNode<dynamic, dynamic> _) {
 }
-), "AssignmentCast", """line 342, column 33 of dart:collection/splay_tree.dart: """, __x19 is _SplayTreeMapNode<dynamic, dynamic>, true))(_remove(DEVC$RT.cast(key, Object, K, "CompositeCast", """line 342, column 41 of dart:collection/splay_tree.dart: """, key is K, false)));
+), "AssignmentCast", """line 342, column 33 of dart:collection/splay_tree.dart: """, __x14 is _SplayTreeMapNode<dynamic, dynamic>, true))(_remove(DEVC$RT.cast(key, Object, K, "CompositeCast", """line 342, column 41 of dart:collection/splay_tree.dart: """, key is K, false)));
  if (mapRoot != null) return DEVC$RT.cast(mapRoot.value, dynamic, V, "CompositeCast", """line 343, column 33 of dart:collection/splay_tree.dart: """, mapRoot.value is V, false);
  return null;
 }
@@ -392,9 +394,9 @@ _rebuildWorkList(_currentNode);
  Iterator<K> get iterator => new _SplayTreeKeyIterator<K>(_tree);
  Set<K> toSet() {
 var setOrMap = _tree;
- SplayTreeSet<K> set = new SplayTreeSet<K>(DEVC$RT.cast(setOrMap._comparator, dynamic, DEVC$RT.type((__t20<K> _) {
+ SplayTreeSet<K> set = new SplayTreeSet<K>(DEVC$RT.cast(setOrMap._comparator, dynamic, DEVC$RT.type((__t15<K> _) {
 }
-), "CompositeCast", """line 613, column 29 of dart:collection/splay_tree.dart: """, setOrMap._comparator is __t20<K>, false), DEVC$RT.cast(setOrMap._validKey, dynamic, __t16, "CompositeCast", """line 613, column 51 of dart:collection/splay_tree.dart: """, setOrMap._validKey is __t16, false));
+), "CompositeCast", """line 613, column 29 of dart:collection/splay_tree.dart: """, setOrMap._comparator is __t15<K>, false), DEVC$RT.cast(setOrMap._validKey, dynamic, __t18, "CompositeCast", """line 613, column 51 of dart:collection/splay_tree.dart: """, setOrMap._validKey is __t18, false));
  set._count = _tree._count;
  set._root = set._copyNode(_tree._root);
  return set;
@@ -422,7 +424,11 @@ var setOrMap = _tree;
 }
  class SplayTreeSet<E> extends _SplayTree<E> with IterableMixin<E>, SetMixin<E> {Comparator _comparator;
  _Predicate _validKey;
- SplayTreeSet([int compare(E key1, E key2), bool isValidKey(potentialKey)]) : _comparator = ((__x26) => DEVC$RT.cast(__x26, dynamic, __t23, "CompositeCast", """line 693, column 23 of dart:collection/splay_tree.dart: """, __x26 is __t23, false))((compare == null) ? Comparable.compare : compare), _validKey = ((__x27) => DEVC$RT.cast(__x27, dynamic, __t16, "CompositeCast", """line 694, column 21 of dart:collection/splay_tree.dart: """, __x27 is __t16, false))((isValidKey != null) ? isValidKey : ((v) => v is E));
+ SplayTreeSet([int compare(E key1, E key2), bool isValidKey(potentialKey)]) : _comparator = ((__x20) => DEVC$RT.cast(__x20, dynamic, DEVC$RT.type((Comparator<dynamic> _) {
+}
+), "CompositeCast", """line 693, column 23 of dart:collection/splay_tree.dart: """, __x20 is Comparator<dynamic>, false))((compare == null) ? Comparable.compare : compare), _validKey = ((__x21) => DEVC$RT.cast(__x21, dynamic, DEVC$RT.type((_Predicate<dynamic> _) {
+}
+), "CompositeCast", """line 694, column 21 of dart:collection/splay_tree.dart: """, __x21 is _Predicate<dynamic>, false))((isValidKey != null) ? isValidKey : ((v) => v is E));
  factory SplayTreeSet.from(Iterable elements, [int compare(E key1, E key2), bool isValidKey(potentialKey)]) {
 SplayTreeSet<E> result = new SplayTreeSet<E>(compare, isValidKey);
  for (final E element in DEVC$RT.cast(elements, DEVC$RT.type((Iterable<dynamic> _) {
@@ -479,9 +485,11 @@ if (_validKey(element)) _remove(DEVC$RT.cast(element, Object, E, "CompositeCast"
 }
 }
  void retainAll(Iterable<Object> elements) {
-SplayTreeSet<E> retainSet = new SplayTreeSet<E>(DEVC$RT.cast(_comparator, __t23, DEVC$RT.type((__t28<E> _) {
+SplayTreeSet<E> retainSet = new SplayTreeSet<E>(DEVC$RT.cast(_comparator, DEVC$RT.type((Comparator<dynamic> _) {
+}
+), DEVC$RT.type((__t22<E> _) {
 }
-), "CompositeCast", """line 773, column 53 of dart:collection/splay_tree.dart: """, _comparator is __t28<E>, false), _validKey);
+), "CompositeCast", """line 773, column 53 of dart:collection/splay_tree.dart: """, _comparator is __t22<E>, false), _validKey);
  int modificationCount = _modificationCount;
  for (Object object in elements) {
 if (modificationCount != _modificationCount) {
@@ -502,18 +510,22 @@ if (!_validKey(object)) return null;
  return _root.key;
 }
  Set<E> intersection(Set<E> other) {
-Set<E> result = new SplayTreeSet<E>(DEVC$RT.cast(_comparator, __t23, DEVC$RT.type((__t28<E> _) {
+Set<E> result = new SplayTreeSet<E>(DEVC$RT.cast(_comparator, DEVC$RT.type((Comparator<dynamic> _) {
 }
-), "CompositeCast", """line 799, column 41 of dart:collection/splay_tree.dart: """, _comparator is __t28<E>, false), _validKey);
+), DEVC$RT.type((__t22<E> _) {
+}
+), "CompositeCast", """line 799, column 41 of dart:collection/splay_tree.dart: """, _comparator is __t22<E>, false), _validKey);
  for (E element in this) {
 if (other.contains(element)) result.add(element);
 }
  return result;
 }
  Set<E> difference(Set<E> other) {
-Set<E> result = new SplayTreeSet<E>(DEVC$RT.cast(_comparator, __t23, DEVC$RT.type((__t28<E> _) {
+Set<E> result = new SplayTreeSet<E>(DEVC$RT.cast(_comparator, DEVC$RT.type((Comparator<dynamic> _) {
+}
+), DEVC$RT.type((__t22<E> _) {
 }
-), "CompositeCast", """line 807, column 41 of dart:collection/splay_tree.dart: """, _comparator is __t28<E>, false), _validKey);
+), "CompositeCast", """line 807, column 41 of dart:collection/splay_tree.dart: """, _comparator is __t22<E>, false), _validKey);
  for (E element in this) {
 if (!other.contains(element)) result.add(element);
 }
@@ -523,9 +535,11 @@ if (!other.contains(element)) result.add(element);
 return _clone()..addAll(other);
 }
  SplayTreeSet<E> _clone() {
-var set = new SplayTreeSet<E>(DEVC$RT.cast(_comparator, __t23, DEVC$RT.type((__t28<E> _) {
+var set = new SplayTreeSet<E>(DEVC$RT.cast(_comparator, DEVC$RT.type((Comparator<dynamic> _) {
+}
+), DEVC$RT.type((__t22<E> _) {
 }
-), "CompositeCast", """line 819, column 35 of dart:collection/splay_tree.dart: """, _comparator is __t28<E>, false), _validKey);
+), "CompositeCast", """line 819, column 35 of dart:collection/splay_tree.dart: """, _comparator is __t22<E>, false), _validKey);
  set._count = _count;
  set._root = _copyNode(_root);
  return set;
@@ -540,8 +554,6 @@ _clear();
  Set<E> toSet() => _clone();
  String toString() => IterableBase.iterableToFullString(this, '{', '}');
 }
- typedef int __t12<K>(K __u13, K __u14);
- typedef bool __t16(dynamic __u17);
- typedef int __t20<K>(K __u21, K __u22);
- typedef int __t23(dynamic __u24, dynamic __u25);
- typedef int __t28<E>(E __u29, E __u30);
+ typedef int __t15<K>(K __u16, K __u17);
+ typedef bool __t18(dynamic __u19);
+ typedef int __t22<E>(E __u23, E __u24);