SDK fixes

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 0002563469bb915cf492595515d68981cd72407e..3fd80b600b8e1bce29726c8ad62e8cc08ffa0572 100644
--- a/test/dart_codegen/expect/collection/splay_tree.dart
+++ b/test/dart_codegen/expect/collection/splay_tree.dart
@@ -143,19 +143,17 @@ _root = null;
  _modificationCount++;
 }
 }
- class _TypeTest<T> {bool test(v) => v is T;
-}
  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 = ((__x12) => DEVC$RT.cast(__x12, dynamic, DEVC$RT.type((Comparator<K> _) {
+ SplayTreeMap([int compare(K key1, K key2), bool isValidKey(potentialKey)]) : _comparator = ((__x16) => DEVC$RT.cast(__x16, dynamic, DEVC$RT.type((Comparator<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 264, column 23 of dart:collection/splay_tree.dart: """, __x16 is Comparator<K>, false))((compare == null) ? Comparable.compare : compare), _validKey = ((__x17) => DEVC$RT.cast(__x17, 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));
+), "CompositeCast", """line 265, column 21 of dart:collection/splay_tree.dart: """, __x17 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) {
-result[k] = DEVC$RT.cast(v, dynamic, V, "CompositeCast", """line 278, column 40 of dart:collection/splay_tree.dart: """, v is V, false);
+result[k] = DEVC$RT.cast(v, dynamic, V, "CompositeCast", """line 274, column 40 of dart:collection/splay_tree.dart: """, v is V, false);
 }
 );
  return result;
@@ -178,26 +176,26 @@ SplayTreeMap<K, V> map = new SplayTreeMap<K, V>(compare, isValidKey);
 if (key == null) throw new ArgumentError(key);
  if (!_validKey(key)) return null;
  if (_root != null) {
-int comp = _splay(DEVC$RT.cast(key, Object, K, "CompositeCast", """line 331, column 25 of dart:collection/splay_tree.dart: """, key is K, false));
+int comp = _splay(DEVC$RT.cast(key, Object, K, "CompositeCast", """line 327, column 25 of dart:collection/splay_tree.dart: """, key is K, false));
  if (comp == 0) {
 _SplayTreeMapNode mapRoot = DEVC$RT.cast(_root, DEVC$RT.type((_SplayTreeNode<K> _) {
-}
+  }
 ), DEVC$RT.type((_SplayTreeMapNode<dynamic, dynamic> _) {
-}
-), "AssignmentCast", """line 333, column 37 of dart:collection/splay_tree.dart: """, _root is _SplayTreeMapNode<dynamic, dynamic>, true);
- return DEVC$RT.cast(mapRoot.value, dynamic, V, "CompositeCast", """line 334, column 16 of dart:collection/splay_tree.dart: """, mapRoot.value is V, false);
+  }
+), "AssignmentCast", """line 329, column 37 of dart:collection/splay_tree.dart: """, _root is _SplayTreeMapNode<dynamic, dynamic>, true);
+ return DEVC$RT.cast(mapRoot.value, dynamic, V, "CompositeCast", """line 330, column 16 of dart:collection/splay_tree.dart: """, mapRoot.value is V, false);
 }
 }
  return null;
 }
  V remove(Object key) {
 if (!_validKey(key)) return null;
- _SplayTreeMapNode mapRoot = ((__x14) => DEVC$RT.cast(__x14, DEVC$RT.type((_SplayTreeNode<dynamic> _) {
+ _SplayTreeMapNode mapRoot = ((__x18) => DEVC$RT.cast(__x18, DEVC$RT.type((_SplayTreeNode<dynamic> _) {
 }
 ), DEVC$RT.type((_SplayTreeMapNode<dynamic, dynamic> _) {
 }
-), "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);
+), "AssignmentCast", """line 338, column 33 of dart:collection/splay_tree.dart: """, __x18 is _SplayTreeMapNode<dynamic, dynamic>, true))(_remove(DEVC$RT.cast(key, Object, K, "CompositeCast", """line 338, 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 339, column 33 of dart:collection/splay_tree.dart: """, mapRoot.value is V, false);
  return null;
 }
  void operator []=(K key, V value) {
@@ -208,7 +206,7 @@ _SplayTreeMapNode mapRoot = DEVC$RT.cast(_root, DEVC$RT.type((_SplayTreeNode<K>
 }
 ), DEVC$RT.type((_SplayTreeMapNode<dynamic, dynamic> _) {
 }
-), "AssignmentCast", """line 353, column 35 of dart:collection/splay_tree.dart: """, _root is _SplayTreeMapNode<dynamic, dynamic>, true);
+), "AssignmentCast", """line 349, column 35 of dart:collection/splay_tree.dart: """, _root is _SplayTreeMapNode<dynamic, dynamic>, true);
  mapRoot.value = value;
  return;}
  _addNewRoot(new _SplayTreeMapNode<K, dynamic>(key, value), comp);
@@ -221,8 +219,8 @@ _SplayTreeMapNode mapRoot = DEVC$RT.cast(_root, DEVC$RT.type((_SplayTreeNode<K>
 }
 ), DEVC$RT.type((_SplayTreeMapNode<dynamic, dynamic> _) {
 }
-), "AssignmentCast", """line 365, column 35 of dart:collection/splay_tree.dart: """, _root is _SplayTreeMapNode<dynamic, dynamic>, true);
- return DEVC$RT.cast(mapRoot.value, dynamic, V, "CompositeCast", """line 366, column 14 of dart:collection/splay_tree.dart: """, mapRoot.value is V, false);
+), "AssignmentCast", """line 361, column 35 of dart:collection/splay_tree.dart: """, _root is _SplayTreeMapNode<dynamic, dynamic>, true);
+ return DEVC$RT.cast(mapRoot.value, dynamic, V, "CompositeCast", """line 362, column 14 of dart:collection/splay_tree.dart: """, mapRoot.value is V, false);
 }
  int modificationCount = _modificationCount;
  int splayCount = _splayCount;
@@ -253,7 +251,7 @@ _SplayTreeMapNode<K, V> node = DEVC$RT.cast(nodes.current, DEVC$RT.type((_SplayT
 }
 ), DEVC$RT.type((_SplayTreeMapNode<K, V> _) {
 }
-), "CompositeCast", """line 397, column 38 of dart:collection/splay_tree.dart: """, nodes.current is _SplayTreeMapNode<K, V>, false);
+), "CompositeCast", """line 393, column 38 of dart:collection/splay_tree.dart: """, nodes.current is _SplayTreeMapNode<K, V>, false);
  f(node.key, node.value);
 }
 }
@@ -264,7 +262,7 @@ return _count;
 _clear();
 }
  bool containsKey(Object key) {
-return _validKey(key) && _splay(DEVC$RT.cast(key, Object, K, "CompositeCast", """line 411, column 37 of dart:collection/splay_tree.dart: """, key is K, false)) == 0;
+return _validKey(key) && _splay(DEVC$RT.cast(key, Object, K, "CompositeCast", """line 407, column 37 of dart:collection/splay_tree.dart: """, key is K, false)) == 0;
 }
  bool containsValue(Object value) {
 bool found = false;
@@ -273,18 +271,18 @@ bool found = false;
 while (node != null) {
 if (node.value == value) return true;
  if (initialSplayCount != _splayCount) {
-throw new ConcurrentModificationError(this);
-}
+  throw new ConcurrentModificationError(this);
+  }
  if (node.right != null && visit(DEVC$RT.cast(node.right, DEVC$RT.type((_SplayTreeNode<dynamic> _) {
-}
+  }
 ), DEVC$RT.type((_SplayTreeMapNode<dynamic, dynamic> _) {
-}
-), "ImplicitCast", """line 423, column 41 of dart:collection/splay_tree.dart: """, node.right is _SplayTreeMapNode<dynamic, dynamic>, true))) return true;
+  }
+), "ImplicitCast", """line 419, column 41 of dart:collection/splay_tree.dart: """, node.right is _SplayTreeMapNode<dynamic, dynamic>, true))) return true;
  node = DEVC$RT.cast(node.left, DEVC$RT.type((_SplayTreeNode<dynamic> _) {
-}
+  }
 ), DEVC$RT.type((_SplayTreeMapNode<dynamic, dynamic> _) {
-}
-), "ImplicitCast", """line 424, column 16 of dart:collection/splay_tree.dart: """, node.left is _SplayTreeMapNode<dynamic, dynamic>, true);
+  }
+), "ImplicitCast", """line 420, column 16 of dart:collection/splay_tree.dart: """, node.left is _SplayTreeMapNode<dynamic, dynamic>, true);
 }
  return false;
 }
@@ -292,7 +290,7 @@ throw new ConcurrentModificationError(this);
 }
 ), DEVC$RT.type((_SplayTreeMapNode<dynamic, dynamic> _) {
 }
-), "ImplicitCast", """line 428, column 18 of dart:collection/splay_tree.dart: """, _root is _SplayTreeMapNode<dynamic, dynamic>, true));
+), "ImplicitCast", """line 424, column 18 of dart:collection/splay_tree.dart: """, _root is _SplayTreeMapNode<dynamic, dynamic>, true));
 }
  Iterable<K> get keys => new _SplayTreeKeyIterable<K>(this);
  Iterable<V> get values => new _SplayTreeValueIterable<K, V>(this);
@@ -301,11 +299,11 @@ return Maps.mapToString(this);
 }
  K firstKey() {
 if (_root == null) return null;
- return DEVC$RT.cast(_first.key, dynamic, K, "CompositeCast", """line 444, column 12 of dart:collection/splay_tree.dart: """, _first.key is K, false);
+ return DEVC$RT.cast(_first.key, dynamic, K, "CompositeCast", """line 440, column 12 of dart:collection/splay_tree.dart: """, _first.key is K, false);
 }
  K lastKey() {
 if (_root == null) return null;
- return DEVC$RT.cast(_last.key, dynamic, K, "CompositeCast", """line 452, column 12 of dart:collection/splay_tree.dart: """, _last.key is K, false);
+ return DEVC$RT.cast(_last.key, dynamic, K, "CompositeCast", """line 448, column 12 of dart:collection/splay_tree.dart: """, _last.key is K, false);
 }
  K lastKeyBefore(K key) {
 if (key == null) throw new ArgumentError(key);
@@ -352,7 +350,11 @@ _workList.add(tree._root);
 }
  T get current {
 if (_currentNode == null) return null;
- return _getValue(_currentNode);
+ return _getValue(DEVC$RT.cast(_currentNode, DEVC$RT.type((_SplayTreeNode<dynamic> _) {
+}
+), DEVC$RT.type((_SplayTreeMapNode<dynamic, dynamic> _) {
+}
+), "ImplicitCast", """line 544, column 22 of dart:collection/splay_tree.dart: """, _currentNode is _SplayTreeMapNode<dynamic, dynamic>, true));
 }
  void _findLeftMostDescendent(_SplayTreeNode node) {
 while (node != null) {
@@ -385,7 +387,7 @@ _rebuildWorkList(_currentNode);
  _findLeftMostDescendent(_currentNode.right);
  return true;
 }
- T _getValue(_SplayTreeNode node);
+ T _getValue(_SplayTreeMapNode node);
 }
  class _SplayTreeKeyIterable<K> extends IterableBase<K> implements EfficientLength {_SplayTree<K> _tree;
  _SplayTreeKeyIterable(this._tree);
@@ -394,9 +396,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((__CastType15<K> _) {
+ SplayTreeSet<K> set = new SplayTreeSet<K>(DEVC$RT.cast(setOrMap._comparator, dynamic, DEVC$RT.type((__CastType19<K> _) {
 }
-), "CompositeCast", """line 613, column 29 of dart:collection/splay_tree.dart: """, setOrMap._comparator is __CastType15<K>, false), DEVC$RT.cast(setOrMap._validKey, dynamic, __CastType18, "CompositeCast", """line 613, column 51 of dart:collection/splay_tree.dart: """, setOrMap._validKey is __CastType18, false));
+), "CompositeCast", """line 609, column 29 of dart:collection/splay_tree.dart: """, setOrMap._comparator is __CastType19<K>, false), DEVC$RT.cast(setOrMap._validKey, dynamic, __CastType22, "CompositeCast", """line 609, column 51 of dart:collection/splay_tree.dart: """, setOrMap._validKey is __CastType22, false));
  set._count = _tree._count;
  set._root = set._copyNode(_tree._root);
  return set;
@@ -409,10 +411,10 @@ var setOrMap = _tree;
  Iterator<V> get iterator => new _SplayTreeValueIterator<K, V>(_map);
 }
  class _SplayTreeKeyIterator<K> extends _SplayTreeIterator<K> {_SplayTreeKeyIterator(_SplayTree<K> map) : super(map);
- K _getValue(_SplayTreeNode node) => DEVC$RT.cast(node.key, dynamic, K, "CompositeCast", """line 631, column 39 of dart:collection/splay_tree.dart: """, node.key is K, false);
+ K _getValue(_SplayTreeNode node) => DEVC$RT.cast(node.key, dynamic, K, "CompositeCast", """line 627, column 39 of dart:collection/splay_tree.dart: """, node.key is K, false);
 }
  class _SplayTreeValueIterator<K, V> extends _SplayTreeIterator<V> {_SplayTreeValueIterator(SplayTreeMap<K, V> map) : super(map);
- V _getValue(_SplayTreeMapNode node) => DEVC$RT.cast(node.value, dynamic, V, "CompositeCast", """line 636, column 42 of dart:collection/splay_tree.dart: """, node.value is V, false);
+ V _getValue(_SplayTreeMapNode node) => DEVC$RT.cast(node.value, dynamic, V, "CompositeCast", """line 632, column 42 of dart:collection/splay_tree.dart: """, node.value is V, false);
 }
  class _SplayTreeNodeIterator<K> extends _SplayTreeIterator<_SplayTreeNode<K>> {_SplayTreeNodeIterator(_SplayTree<K> tree) : super(tree);
  _SplayTreeNodeIterator.startAt(_SplayTree<K> tree, var startKey) : super.startAt(tree, startKey);
@@ -420,22 +422,22 @@ var setOrMap = _tree;
 }
 ), DEVC$RT.type((_SplayTreeNode<K> _) {
 }
-), "CompositeCast", """line 644, column 55 of dart:collection/splay_tree.dart: """, node is _SplayTreeNode<K>, false);
+), "CompositeCast", """line 640, column 55 of dart:collection/splay_tree.dart: """, node is _SplayTreeNode<K>, false);
 }
  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 = ((__x20) => DEVC$RT.cast(__x20, dynamic, DEVC$RT.type((Comparator<dynamic> _) {
+ SplayTreeSet([int compare(E key1, E key2), bool isValidKey(potentialKey)]) : _comparator = ((__x24) => DEVC$RT.cast(__x24, 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 689, column 23 of dart:collection/splay_tree.dart: """, __x24 is Comparator<dynamic>, false))((compare == null) ? Comparable.compare : compare), _validKey = ((__x25) => DEVC$RT.cast(__x25, 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));
+), "CompositeCast", """line 690, column 21 of dart:collection/splay_tree.dart: """, __x25 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> _) {
 }
 ), DEVC$RT.type((Iterable<E> _) {
 }
-), "CompositeCast", """line 707, column 29 of dart:collection/splay_tree.dart: """, elements is Iterable<E>, false)) {
+), "CompositeCast", """line 703, column 29 of dart:collection/splay_tree.dart: """, elements is Iterable<E>, false)) {
 result.add(element);
 }
  return result;
@@ -447,11 +449,11 @@ result.add(element);
  bool get isNotEmpty => _root != null;
  E get first {
 if (_count == 0) throw IterableElementError.noElement();
- return DEVC$RT.cast(_first.key, dynamic, E, "CompositeCast", """line 725, column 12 of dart:collection/splay_tree.dart: """, _first.key is E, false);
+ return DEVC$RT.cast(_first.key, dynamic, E, "CompositeCast", """line 721, column 12 of dart:collection/splay_tree.dart: """, _first.key is E, false);
 }
  E get last {
 if (_count == 0) throw IterableElementError.noElement();
- return DEVC$RT.cast(_last.key, dynamic, E, "CompositeCast", """line 730, column 12 of dart:collection/splay_tree.dart: """, _last.key is E, false);
+ return DEVC$RT.cast(_last.key, dynamic, E, "CompositeCast", """line 726, column 12 of dart:collection/splay_tree.dart: """, _last.key is E, false);
 }
  E get single {
 if (_count == 0) throw IterableElementError.noElement();
@@ -459,7 +461,7 @@ if (_count == 0) throw IterableElementError.noElement();
  return _root.key;
 }
  bool contains(Object object) {
-return _validKey(object) && _splay(DEVC$RT.cast(object, Object, E, "CompositeCast", """line 741, column 40 of dart:collection/splay_tree.dart: """, object is E, false)) == 0;
+return _validKey(object) && _splay(DEVC$RT.cast(object, Object, E, "CompositeCast", """line 737, column 40 of dart:collection/splay_tree.dart: """, object is E, false)) == 0;
 }
  bool add(E element) {
 int compare = _splay(element);
@@ -469,7 +471,7 @@ int compare = _splay(element);
 }
  bool remove(Object object) {
 if (!_validKey(object)) return false;
- return _remove(DEVC$RT.cast(object, Object, E, "CompositeCast", """line 753, column 20 of dart:collection/splay_tree.dart: """, object is E, false)) != null;
+ return _remove(DEVC$RT.cast(object, Object, E, "CompositeCast", """line 749, column 20 of dart:collection/splay_tree.dart: """, object is E, false)) != null;
 }
  void addAll(Iterable<E> elements) {
 for (E element in elements) {
@@ -481,21 +483,21 @@ _addNewRoot(new _SplayTreeNode<E>(element), compare);
 }
  void removeAll(Iterable<Object> elements) {
 for (Object element in elements) {
-if (_validKey(element)) _remove(DEVC$RT.cast(element, Object, E, "CompositeCast", """line 767, column 39 of dart:collection/splay_tree.dart: """, element is E, false));
+if (_validKey(element)) _remove(DEVC$RT.cast(element, Object, E, "CompositeCast", """line 763, column 39 of dart:collection/splay_tree.dart: """, element is E, false));
 }
 }
  void retainAll(Iterable<Object> elements) {
 SplayTreeSet<E> retainSet = new SplayTreeSet<E>(DEVC$RT.cast(_comparator, DEVC$RT.type((Comparator<dynamic> _) {
 }
-), DEVC$RT.type((__CastType22<E> _) {
+), DEVC$RT.type((__CastType26<E> _) {
 }
-), "CompositeCast", """line 773, column 53 of dart:collection/splay_tree.dart: """, _comparator is __CastType22<E>, false), _validKey);
+), "CompositeCast", """line 769, column 53 of dart:collection/splay_tree.dart: """, _comparator is __CastType26<E>, false), _validKey);
  int modificationCount = _modificationCount;
  for (Object object in elements) {
 if (modificationCount != _modificationCount) {
 throw new ConcurrentModificationError(this);
 }
- if (_validKey(object) && _splay(DEVC$RT.cast(object, Object, E, "CompositeCast", """line 781, column 39 of dart:collection/splay_tree.dart: """, object is E, false)) == 0) retainSet.add(_root.key);
+ if (_validKey(object) && _splay(DEVC$RT.cast(object, Object, E, "CompositeCast", """line 777, column 39 of dart:collection/splay_tree.dart: """, object is E, false)) == 0) retainSet.add(_root.key);
 }
  if (retainSet._count != _count) {
 _root = retainSet._root;
@@ -505,27 +507,27 @@ _root = retainSet._root;
 }
  E lookup(Object object) {
 if (!_validKey(object)) return null;
- int comp = _splay(DEVC$RT.cast(object, Object, E, "CompositeCast", """line 793, column 23 of dart:collection/splay_tree.dart: """, object is E, false));
+ int comp = _splay(DEVC$RT.cast(object, Object, E, "CompositeCast", """line 789, column 23 of dart:collection/splay_tree.dart: """, object is E, false));
  if (comp != 0) return null;
  return _root.key;
 }
- Set<E> intersection(Set<E> other) {
+ Set<E> intersection(Set<Object> other) {
 Set<E> result = new SplayTreeSet<E>(DEVC$RT.cast(_comparator, DEVC$RT.type((Comparator<dynamic> _) {
 }
-), DEVC$RT.type((__CastType22<E> _) {
+), DEVC$RT.type((__CastType26<E> _) {
 }
-), "CompositeCast", """line 799, column 41 of dart:collection/splay_tree.dart: """, _comparator is __CastType22<E>, false), _validKey);
+), "CompositeCast", """line 795, column 41 of dart:collection/splay_tree.dart: """, _comparator is __CastType26<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> difference(Set<Object> other) {
 Set<E> result = new SplayTreeSet<E>(DEVC$RT.cast(_comparator, DEVC$RT.type((Comparator<dynamic> _) {
 }
-), DEVC$RT.type((__CastType22<E> _) {
+), DEVC$RT.type((__CastType26<E> _) {
 }
-), "CompositeCast", """line 807, column 41 of dart:collection/splay_tree.dart: """, _comparator is __CastType22<E>, false), _validKey);
+), "CompositeCast", """line 803, column 41 of dart:collection/splay_tree.dart: """, _comparator is __CastType26<E>, false), _validKey);
  for (E element in this) {
 if (!other.contains(element)) result.add(element);
 }
@@ -537,9 +539,9 @@ return _clone()..addAll(other);
  SplayTreeSet<E> _clone() {
 var set = new SplayTreeSet<E>(DEVC$RT.cast(_comparator, DEVC$RT.type((Comparator<dynamic> _) {
 }
-), DEVC$RT.type((__CastType22<E> _) {
+), DEVC$RT.type((__CastType26<E> _) {
 }
-), "CompositeCast", """line 819, column 35 of dart:collection/splay_tree.dart: """, _comparator is __CastType22<E>, false), _validKey);
+), "CompositeCast", """line 815, column 35 of dart:collection/splay_tree.dart: """, _comparator is __CastType26<E>, false), _validKey);
  set._count = _count;
  set._root = _copyNode(_root);
  return set;
@@ -554,6 +556,6 @@ _clear();
  Set<E> toSet() => _clone();
  String toString() => IterableBase.iterableToFullString(this, '{', '}');
 }
- typedef int __CastType15<K>(K __u16, K __u17);
- typedef bool __CastType18(dynamic __u19);
- typedef int __CastType22<E>(E __u23, E __u24);
+ typedef int __CastType19<K>(K __u20, K __u21);
+ typedef bool __CastType22(dynamic __u23);
+ typedef int __CastType26<E>(E __u27, E __u28);