Downwards closure inference

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 bbb8dd4e65e08d081cb9119b4a23926114e42fbc..8f68e941b762b55028cf6cd630dbc56a799940e7 100644
--- a/test/dart_codegen/expect/collection/splay_tree.dart
+++ b/test/dart_codegen/expect/collection/splay_tree.dart
@@ -147,9 +147,9 @@ _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 = ((__x21) => DEVC$RT.cast(__x21, dynamic, DEVC$RT.type((__t18<K> _) {
+ SplayTreeMap([int compare(K key1, K key2), bool isValidKey(potentialKey)]) : _comparator = ((__x15) => DEVC$RT.cast(__x15, dynamic, DEVC$RT.type((__t12<K> _) {
 }
-), "CompositeCast", """line 268, column 23 of dart:collection/splay_tree.dart: """, __x21 is __t18<K>, false))((compare == null) ? Comparable.compare : compare), _validKey = ((__x24) => DEVC$RT.cast(__x24, dynamic, __t22, "CompositeCast", """line 269, column 21 of dart:collection/splay_tree.dart: """, __x24 is __t22, false))((isValidKey != null) ? isValidKey : ((v) => v is 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));
  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 +190,11 @@ _SplayTreeMapNode mapRoot = DEVC$RT.cast(_root, DEVC$RT.type((_SplayTreeNode<K>
 }
  V remove(Object key) {
 if (!_validKey(key)) return null;
- _SplayTreeMapNode mapRoot = ((__x25) => DEVC$RT.cast(__x25, DEVC$RT.type((_SplayTreeNode<dynamic> _) {
+ _SplayTreeMapNode mapRoot = ((__x19) => DEVC$RT.cast(__x19, DEVC$RT.type((_SplayTreeNode<dynamic> _) {
 }
 ), DEVC$RT.type((_SplayTreeMapNode<dynamic, dynamic> _) {
 }
-), "AssignmentCast", """line 342, column 33 of dart:collection/splay_tree.dart: """, __x25 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: """, __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)));
  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 +392,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((__t26<K> _) {
+ SplayTreeSet<K> set = new SplayTreeSet<K>(DEVC$RT.cast(setOrMap._comparator, dynamic, DEVC$RT.type((__t20<K> _) {
 }
-), "CompositeCast", """line 613, column 29 of dart:collection/splay_tree.dart: """, setOrMap._comparator is __t26<K>, false), DEVC$RT.cast(setOrMap._validKey, dynamic, __t22, "CompositeCast", """line 613, column 51 of dart:collection/splay_tree.dart: """, setOrMap._validKey is __t22, false));
+), "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));
  set._count = _tree._count;
  set._root = set._copyNode(_tree._root);
  return set;
@@ -422,7 +422,7 @@ 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 = ((__x32) => DEVC$RT.cast(__x32, dynamic, __t29, "CompositeCast", """line 693, column 23 of dart:collection/splay_tree.dart: """, __x32 is __t29, false))((compare == null) ? Comparable.compare : compare), _validKey = ((__x33) => DEVC$RT.cast(__x33, dynamic, __t22, "CompositeCast", """line 694, column 21 of dart:collection/splay_tree.dart: """, __x33 is __t22, false))((isValidKey != null) ? isValidKey : ((v) => v is E));
+ 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));
  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,13 +479,13 @@ if (_validKey(element)) _remove(DEVC$RT.cast(element, Object, E, "CompositeCast"
 }
 }
  void retainAll(Iterable<Object> elements) {
-SplayTreeSet<E> retainSet = new SplayTreeSet<E>(DEVC$RT.wrap((int f(dynamic __u34, dynamic __u35)) {
+SplayTreeSet<E> retainSet = new SplayTreeSet<E>(DEVC$RT.wrap((int f(dynamic __u28, dynamic __u29)) {
 int c(dynamic x0, dynamic x1) => f(x0, x1);
  return f == null ? null : c;
 }
-, _comparator, __t29, DEVC$RT.type((__t36<E> _) {
+, _comparator, __t23, DEVC$RT.type((__t30<E> _) {
 }
-), "Wrap", """line 773, column 53 of dart:collection/splay_tree.dart: """, _comparator is __t36<E>), _validKey);
+), "Wrap", """line 773, column 53 of dart:collection/splay_tree.dart: """, _comparator is __t30<E>), _validKey);
  int modificationCount = _modificationCount;
  for (Object object in elements) {
 if (modificationCount != _modificationCount) {
@@ -506,26 +506,26 @@ if (!_validKey(object)) return null;
  return _root.key;
 }
  Set<E> intersection(Set<E> other) {
-Set<E> result = new SplayTreeSet<E>(DEVC$RT.wrap((int f(dynamic __u39, dynamic __u40)) {
+Set<E> result = new SplayTreeSet<E>(DEVC$RT.wrap((int f(dynamic __u33, dynamic __u34)) {
 int c(dynamic x0, dynamic x1) => f(x0, x1);
  return f == null ? null : c;
 }
-, _comparator, __t29, DEVC$RT.type((__t36<E> _) {
+, _comparator, __t23, DEVC$RT.type((__t30<E> _) {
 }
-), "Wrap", """line 799, column 41 of dart:collection/splay_tree.dart: """, _comparator is __t36<E>), _validKey);
+), "Wrap", """line 799, column 41 of dart:collection/splay_tree.dart: """, _comparator is __t30<E>), _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.wrap((int f(dynamic __u41, dynamic __u42)) {
+Set<E> result = new SplayTreeSet<E>(DEVC$RT.wrap((int f(dynamic __u35, dynamic __u36)) {
 int c(dynamic x0, dynamic x1) => f(x0, x1);
  return f == null ? null : c;
 }
-, _comparator, __t29, DEVC$RT.type((__t36<E> _) {
+, _comparator, __t23, DEVC$RT.type((__t30<E> _) {
 }
-), "Wrap", """line 807, column 41 of dart:collection/splay_tree.dart: """, _comparator is __t36<E>), _validKey);
+), "Wrap", """line 807, column 41 of dart:collection/splay_tree.dart: """, _comparator is __t30<E>), _validKey);
  for (E element in this) {
 if (!other.contains(element)) result.add(element);
 }
@@ -535,13 +535,13 @@ if (!other.contains(element)) result.add(element);
 return _clone()..addAll(other);
 }
  SplayTreeSet<E> _clone() {
-var set = new SplayTreeSet<E>(DEVC$RT.wrap((int f(dynamic __u43, dynamic __u44)) {
+var set = new SplayTreeSet<E>(DEVC$RT.wrap((int f(dynamic __u37, dynamic __u38)) {
 int c(dynamic x0, dynamic x1) => f(x0, x1);
  return f == null ? null : c;
 }
-, _comparator, __t29, DEVC$RT.type((__t36<E> _) {
+, _comparator, __t23, DEVC$RT.type((__t30<E> _) {
 }
-), "Wrap", """line 819, column 35 of dart:collection/splay_tree.dart: """, _comparator is __t36<E>), _validKey);
+), "Wrap", """line 819, column 35 of dart:collection/splay_tree.dart: """, _comparator is __t30<E>), _validKey);
  set._count = _count;
  set._root = _copyNode(_root);
  return set;
@@ -556,8 +556,8 @@ _clear();
  Set<E> toSet() => _clone();
  String toString() => IterableBase.iterableToFullString(this, '{', '}');
 }
- typedef int __t18<K>(K __u19, K __u20);
- typedef bool __t22(dynamic __u23);
- typedef int __t26<K>(K __u27, K __u28);
- typedef int __t29(dynamic __u30, dynamic __u31);
- typedef int __t36<E>(E __u37, E __u38);
+ 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 __t30<E>(E __u31, E __u32);