Allow S->T <: dynamic->T

test/dart_codegen/expect/_internal/iterable.dart

 part of dart._internal;
  abstract class EfficientLength {int get length;
 }
  abstract class ListIterable<E> extends IterableBase<E> implements EfficientLength {int get length;
  E elementAt(int i);
  const ListIterable();
  Iterator<E> get iterator => new ListIterator<E>(this);
  void forEach(void action(E element)) {
 int length = this.length;
  for (int i = 0; i < length; i++) {
@@ skipping 118 matching lines @@
    for (int i = 0; i < length; i++) {
     buffer.write(elementAt(i));
      if (length != this.length) {
       throw new ConcurrentModificationError(this);
       }
     }
    return buffer.toString();
   }
 }
  Iterable<E> where(bool test(E element)) => super.where(test);
- Iterable map(f(E element)) => new MappedListIterable(this, DEVC$RT.wrap((dynamic f(E __u0)) {
-dynamic c(E x0) => f(DEVC$RT.cast(x0, dynamic, E, "CastParam", """line 175, column 62 of dart:_internal/iterable.dart: """, x0 is E, false));
- return f == null ? null : c;
-}
-, f, null, __t1, "Wrap", """line 175, column 62 of dart:_internal/iterable.dart: """, f is __t1));
+ Iterable map(f(E element)) => new MappedListIterable(this, f);
  E reduce(E combine(var value, E element)) {
 int length = this.length;
  if (length == 0) throw IterableElementError.noElement();
  E value = elementAt(0);
  for (int i = 1; i < length; i++) {
   value = combine(value, elementAt(i));
    if (length != this.length) {
     throw new ConcurrentModificationError(this);
     }
   }
@@ skipping 176 matching lines @@
  T get current => _current;
 }
  class MappedListIterable<S, T> extends ListIterable<T> implements EfficientLength {final Iterable<S> _source;
  final _Transformation<S, T> _f;
  MappedListIterable(this._source, T this._f(S value));
  int get length => _source.length;
  T elementAt(int index) => _f(_source.elementAt(index));
 }
  typedef bool _ElementPredicate<E>(E element);
  class WhereIterable<E> extends IterableBase<E> {final Iterable<E> _iterable;
- final _ElementPredicate _f;
+ final _ElementPredicate<E> _f;
  WhereIterable(this._iterable, bool this._f(E element));
  Iterator<E> get iterator => new WhereIterator<E>(_iterable.iterator, _f);
 }
  class WhereIterator<E> extends Iterator<E> {final Iterator<E> _iterator;
- final _ElementPredicate _f;
+ final _ElementPredicate<E> _f;
  WhereIterator(this._iterator, bool this._f(E element));
  bool moveNext() {
 while (_iterator.moveNext()) {
 if (_f(_iterator.current)) {
 return true;
 }
 }
  return false;
 }
  E get current => _iterator.current;
 }
  typedef Iterable<T> _ExpandFunction<S, T>(S sourceElement);
  class ExpandIterable<S, T> extends IterableBase<T> {final Iterable<S> _iterable;
  final _ExpandFunction _f;
  ExpandIterable(this._iterable, Iterable<T> this._f(S element));
- Iterator<T> get iterator => new ExpandIterator<S, T>(_iterable.iterator, DEVC$RT.wrap((Iterable<dynamic> f(dynamic __u6)) {
-Iterable<dynamic> c(dynamic x0) => ((__x5) => DEVC$RT.cast(__x5, DEVC$RT.type((Iterable<dynamic> _) {
+ Iterator<T> get iterator => new ExpandIterator<S, T>(_iterable.iterator, DEVC$RT.wrap((Iterable<dynamic> f(dynamic __u1)) {
+Iterable<dynamic> c(dynamic x0) => ((__x0) => DEVC$RT.cast(__x0, DEVC$RT.type((Iterable<dynamic> _) {
 }
 ), DEVC$RT.type((Iterable<T> _) {
 }
-), "CastResult", """line 454, column 76 of dart:_internal/iterable.dart: """, __x5 is Iterable<T>, false))(f(x0));
+), "CastResult", """line 454, column 76 of dart:_internal/iterable.dart: """, __x0 is Iterable<T>, false))(f(x0));
  return f == null ? null : c;
 }
-, _f, null, DEVC$RT.type((__t7<S, T> _) {
+, _f, null, DEVC$RT.type((__t2<S, T> _) {
 }
-), "Wrap", """line 454, column 76 of dart:_internal/iterable.dart: """, _f is __t7<S, T>));
+), "Wrap", """line 454, column 76 of dart:_internal/iterable.dart: """, _f is __t2<S, T>));
 }
  class ExpandIterator<S, T> implements Iterator<T> {final Iterator<S> _iterator;
  final _ExpandFunction _f;
- Iterator<T> _currentExpansion = ((__x11) => DEVC$RT.cast(__x11, null, DEVC$RT.type((Iterator<T> _) {
+ Iterator<T> _currentExpansion = ((__x6) => DEVC$RT.cast(__x6, null, DEVC$RT.type((Iterator<T> _) {
 }
-), "CastExact", """line 463, column 35 of dart:_internal/iterable.dart: """, __x11 is Iterator<T>, false))(const EmptyIterator());
+), "CastExact", """line 463, column 35 of dart:_internal/iterable.dart: """, __x6 is Iterator<T>, false))(const EmptyIterator());
  T _current;
  ExpandIterator(this._iterator, Iterable<T> this._f(S element));
  void _nextExpansion() {
 }
  T get current => _current;
  bool moveNext() {
 if (_currentExpansion == null) return false;
  while (!_currentExpansion.moveNext()) {
 _current = null;
  if (_iterator.moveNext()) {
 _currentExpansion = null;
- _currentExpansion = ((__x12) => DEVC$RT.cast(__x12, DEVC$RT.type((Iterator<dynamic> _) {
+ _currentExpansion = ((__x7) => DEVC$RT.cast(__x7, DEVC$RT.type((Iterator<dynamic> _) {
 }
 ), DEVC$RT.type((Iterator<T> _) {
 }
-), "CastDynamic", """line 481, column 29 of dart:_internal/iterable.dart: """, __x12 is Iterator<T>, false))(_f(_iterator.current).iterator);
+), "CastDynamic", """line 481, column 29 of dart:_internal/iterable.dart: """, __x7 is Iterator<T>, false))(_f(_iterator.current).iterator);
 }
  else {
 return false;
 }
 }
  _current = _currentExpansion.current;
  return true;
 }
 }
  class TakeIterable<E> extends IterableBase<E> {final Iterable<E> _iterable;
@@ skipping 33 matching lines @@
 }
  E get current {
 if (_remaining < 0) return null;
  return _iterator.current;
 }
 }
  class TakeWhileIterable<E> extends IterableBase<E> {final Iterable<E> _iterable;
  final _ElementPredicate _f;
  TakeWhileIterable(this._iterable, bool this._f(E element));
  Iterator<E> get iterator {
-return new TakeWhileIterator<E>(_iterable.iterator, _f);
+return new TakeWhileIterator<E>(_iterable.iterator, DEVC$RT.wrap((bool f(dynamic __u8)) {
+bool c(dynamic x0) => f(x0);
+ return f == null ? null : c;
+}
+, _f, null, DEVC$RT.type((__t9<E> _) {
+}
+), "Wrap", """line 555, column 57 of dart:_internal/iterable.dart: """, _f is __t9<E>));
 }
 }
  class TakeWhileIterator<E> extends Iterator<E> {final Iterator<E> _iterator;
  final _ElementPredicate _f;
  bool _isFinished = false;
  TakeWhileIterator(this._iterator, bool this._f(E element));
  bool moveNext() {
 if (_isFinished) return false;
  if (!_iterator.moveNext() || !_f(_iterator.current)) {
 _isFinished = true;
@@ skipping 46 matching lines @@
 for (int i = 0; i < _skipCount; i++) _iterator.moveNext();
  _skipCount = 0;
  return _iterator.moveNext();
 }
  E get current => _iterator.current;
 }
  class SkipWhileIterable<E> extends IterableBase<E> {final Iterable<E> _iterable;
  final _ElementPredicate _f;
  SkipWhileIterable(this._iterable, bool this._f(E element));
  Iterator<E> get iterator {
-return new SkipWhileIterator<E>(_iterable.iterator, _f);
+return new SkipWhileIterator<E>(_iterable.iterator, DEVC$RT.wrap((bool f(dynamic __u13)) {
+bool c(dynamic x0) => f(x0);
+ return f == null ? null : c;
+}
+, _f, null, DEVC$RT.type((__t14<E> _) {
+}
+), "Wrap", """line 648, column 57 of dart:_internal/iterable.dart: """, _f is __t14<E>));
 }
 }
  class SkipWhileIterator<E> extends Iterator<E> {final Iterator<E> _iterator;
  final _ElementPredicate _f;
  bool _hasSkipped = false;
  SkipWhileIterator(this._iterator, bool this._f(E element));
  bool moveNext() {
 if (!_hasSkipped) {
 _hasSkipped = true;
  while (_iterator.moveNext()) {
 if (!_f(_iterator.current)) return true;
 }
 }
  return _iterator.moveNext();
 }
  E get current => _iterator.current;
 }
  class EmptyIterable<E> extends IterableBase<E> implements EfficientLength {const EmptyIterable();
- Iterator<E> get iterator => ((__x13) => DEVC$RT.cast(__x13, null, DEVC$RT.type((Iterator<E> _) {
+ Iterator<E> get iterator => ((__x16) => DEVC$RT.cast(__x16, null, DEVC$RT.type((Iterator<E> _) {
 }
-), "CastExact", """line 678, column 31 of dart:_internal/iterable.dart: """, __x13 is Iterator<E>, false))(const EmptyIterator());
+), "CastExact", """line 678, column 31 of dart:_internal/iterable.dart: """, __x16 is Iterator<E>, false))(const EmptyIterator());
  void forEach(void action(E element)) {
 }
  bool get isEmpty => true;
  int get length => 0;
  E get first {
 throw IterableElementError.noElement();
 }
  E get last {
 throw IterableElementError.noElement();
 }
@@ skipping 211 matching lines @@
  buffer.write(list[i]);
 }
 }
  return buffer.toString();
 }
  Iterable<T> where(Iterable iterable, bool f(var element)) {
 return new WhereIterable<T>(DEVC$RT.cast(iterable, DEVC$RT.type((Iterable<dynamic> _) {
 }
 ), DEVC$RT.type((Iterable<T> _) {
 }
-), "CastDynamic", """line 961, column 33 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), f);
+), "CastDynamic", """line 961, column 33 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), DEVC$RT.wrap((bool f(dynamic __u17)) {
+bool c(dynamic x0) => f(x0);
+ return f == null ? null : c;
+}
+, f, null, DEVC$RT.type((__t18<T> _) {
+}
+), "Wrap", """line 961, column 43 of dart:_internal/iterable.dart: """, f is __t18<T>));
 }
  static Iterable map(Iterable iterable, f(var element)) {
 return new MappedIterable(iterable, f);
 }
  static Iterable mapList(List list, f(var element)) {
 return new MappedListIterable(list, f);
 }
  static Iterable expand(Iterable iterable, Iterable f(var element)) {
 return new ExpandIterable(iterable, f);
 }
  Iterable<T> takeList(List list, int n) {
 return new SubListIterable<T>(DEVC$RT.cast(list, DEVC$RT.type((List<dynamic> _) {
 }
 ), DEVC$RT.type((Iterable<T> _) {
 }
 ), "CastDynamic", """line 978, column 35 of dart:_internal/iterable.dart: """, list is Iterable<T>, false), 0, n);
 }
  Iterable<T> takeWhile(Iterable iterable, bool test(var value)) {
 return new TakeWhileIterable<T>(DEVC$RT.cast(iterable, DEVC$RT.type((Iterable<dynamic> _) {
 }
 ), DEVC$RT.type((Iterable<T> _) {
 }
-), "CastDynamic", """line 983, column 37 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), test);
+), "CastDynamic", """line 983, column 37 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), DEVC$RT.wrap((bool f(dynamic __u20)) {
+bool c(dynamic x0) => f(x0);
+ return f == null ? null : c;
+}
+, test, null, DEVC$RT.type((__t18<T> _) {
+}
+), "Wrap", """line 983, column 47 of dart:_internal/iterable.dart: """, test is __t18<T>));
 }
  Iterable<T> skipList(List list, int n) {
 return new SubListIterable<T>(DEVC$RT.cast(list, DEVC$RT.type((List<dynamic> _) {
 }
 ), DEVC$RT.type((Iterable<T> _) {
 }
 ), "CastDynamic", """line 988, column 35 of dart:_internal/iterable.dart: """, list is Iterable<T>, false), n, null);
 }
  Iterable<T> skipWhile(Iterable iterable, bool test(var value)) {
 return new SkipWhileIterable<T>(DEVC$RT.cast(iterable, DEVC$RT.type((Iterable<dynamic> _) {
 }
 ), DEVC$RT.type((Iterable<T> _) {
 }
-), "CastDynamic", """line 993, column 37 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), test);
+), "CastDynamic", """line 993, column 37 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), DEVC$RT.wrap((bool f(dynamic __u21)) {
+bool c(dynamic x0) => f(x0);
+ return f == null ? null : c;
+}
+, test, null, DEVC$RT.type((__t18<T> _) {
+}
+), "Wrap", """line 993, column 47 of dart:_internal/iterable.dart: """, test is __t18<T>));
 }
  Iterable<T> reversedList(List list) {
 return new ReversedListIterable<T>(DEVC$RT.cast(list, DEVC$RT.type((List<dynamic> _) {
 }
 ), DEVC$RT.type((Iterable<T> _) {
 }
 ), "CastDynamic", """line 997, column 40 of dart:_internal/iterable.dart: """, list is Iterable<T>, false));
 }
  static void sortList(List list, int compare(a, b)) {
-if (compare == null) compare = DEVC$RT.wrap((int f(Comparable<dynamic> __u14, Comparable<dynamic> __u15)) {
-int c(Comparable<dynamic> x0, Comparable<dynamic> x1) => f(DEVC$RT.cast(x0, dynamic, DEVC$RT.type((Comparable<dynamic> _) {
-}
-), "CastParam", """line 1001, column 36 of dart:_internal/iterable.dart: """, x0 is Comparable<dynamic>, true), DEVC$RT.cast(x1, dynamic, DEVC$RT.type((Comparable<dynamic> _) {
-}
-), "CastParam", """line 1001, column 36 of dart:_internal/iterable.dart: """, x1 is Comparable<dynamic>, true));
- return f == null ? null : c;
-}
-, Comparable.compare, __t19, __t16, "Wrap", """line 1001, column 36 of dart:_internal/iterable.dart: """, Comparable.compare is __t16);
+if (compare == null) compare = Comparable.compare;
  Sort.sort(list, compare);
 }
  static void shuffleList(List list, Random random) {
 if (random == null) random = new Random();
  int length = list.length;
  while (length > 1) {
 int pos = random.nextInt(length);
  length -= 1;
  var tmp = list[length];
  list[length] = list[pos];
@@ skipping 129 matching lines @@
 result.add(element);
 }
 }
  return result;
 }
 }
  abstract class IterableElementError {static StateError noElement() => new StateError("No element");
  static StateError tooMany() => new StateError("Too many elements");
  static StateError tooFew() => new StateError("Too few elements");
 }
- typedef dynamic __t1(dynamic __u2);
- typedef dynamic __t3<E>(E __u4);
- typedef Iterable<T> __t7<S, T>(S __u8);
- typedef Iterable<dynamic> __t9(dynamic __u10);
- typedef int __t16(dynamic __u17, dynamic __u18);
- typedef int __t19(Comparable<dynamic> __u20, Comparable<dynamic> __u21);
+ typedef Iterable<T> __t2<S, T>(S __u3);
+ typedef Iterable<dynamic> __t4(dynamic __u5);
+ typedef bool __t9<E>(E __u10);
+ typedef bool __t11(dynamic __u12);
+ typedef bool __t14<E>(E __u15);
+ typedef bool __t18<T>(T __u19);