SDK fixes

test/dart_codegen/expect/async/stream.dart

 part of dart.async;
  abstract class Stream<T> {Stream();
  factory Stream.fromFuture(Future<T> future) {
-  _StreamController<T> controller = new StreamController<T>(sync: true);
+  _StreamController<T> controller = ((__x19) => DEVC$RT.cast(__x19, DEVC$RT.type((StreamController<T> _) {
+    }
+  ), DEVC$RT.type((_StreamController<T> _) {
+    }
+  ), "CastUser", """line 88, column 9 of dart:async/stream.dart: """, __x19 is _StreamController<T>, false))(new StreamController<T>(sync: true));
    future.then((value) {
-    controller._add(DEVC$RT.cast(value, dynamic, T, "CompositeCast", """line 89, column 25 of dart:async/stream.dart: """, value is T, false));
+    controller._add(DEVC$RT.cast(value, dynamic, T, "CompositeCast", """line 90, column 25 of dart:async/stream.dart: """, value is T, false));
      controller._closeUnchecked();
     }
   , onError: (error, stackTrace) {
-    controller._addError(error, DEVC$RT.cast(stackTrace, dynamic, StackTrace, "DynamicCast", """line 93, column 37 of dart:async/stream.dart: """, stackTrace is StackTrace, true));
+    controller._addError(error, DEVC$RT.cast(stackTrace, dynamic, StackTrace, "DynamicCast", """line 94, column 37 of dart:async/stream.dart: """, stackTrace is StackTrace, true));
      controller._closeUnchecked();
     }
   );
    return controller.stream;
   }
  factory Stream.fromIterable(Iterable<T> data) {
   return new _GeneratedStreamImpl<T>(() => new _IterablePendingEvents<T>(data));
   }
  factory Stream.periodic(Duration period, [T computation(int computationCount)]) {
-  if (computation == null) computation = ((__x23) => DEVC$RT.cast(__x23, __CastType21, DEVC$RT.type((__CastType19<T> _) {
+  if (computation == null) computation = ((__x24) => DEVC$RT.cast(__x24, __CastType22, DEVC$RT.type((__CastType20<T> _) {
     }
-  ), "CompositeCast", """line 126, column 44 of dart:async/stream.dart: """, __x23 is __CastType19<T>, false))(((i) => null));
+  ), "CompositeCast", """line 127, column 44 of dart:async/stream.dart: """, __x24 is __CastType20<T>, false))(((i) => null));
    Timer timer;
    int computationCount = 0;
    StreamController<T> controller;
    Stopwatch watch = new Stopwatch();
    void sendEvent() {
     watch.reset();
      T data = computation(computationCount++);
      controller.add(data);
     }
    void startPeriodicTimer() {
@@ skipping 22 matching lines @@
     );
     }
   , onCancel: () {
     if (timer != null) timer.cancel();
      timer = null;
     }
   );
    return controller.stream;
   }
  factory Stream.eventTransformed(Stream source, EventSink mapSink(EventSink<T> sink)) {
-  return new _BoundSinkStream<dynamic, T>(source, DEVC$RT.cast(mapSink, DEVC$RT.type((__CastType24<T> _) {
+  return new _BoundSinkStream<dynamic, T>(source, DEVC$RT.cast(mapSink, DEVC$RT.type((__CastType25<T> _) {
     }
   ), DEVC$RT.type((_SinkMapper<dynamic, dynamic> _) {
     }
-  ), "CompositeCast", """line 216, column 41 of dart:async/stream.dart: """, mapSink is _SinkMapper<dynamic, dynamic>, false));
+  ), "CompositeCast", """line 217, column 41 of dart:async/stream.dart: """, mapSink is _SinkMapper<dynamic, dynamic>, false));
   }
  bool get isBroadcast => false;
  Stream<T> asBroadcastStream({
   void onListen(StreamSubscription<T> subscription), void onCancel(StreamSubscription<T> subscription)}
 ) {
-  return new _AsBroadcastStream<T>(this, DEVC$RT.cast(onListen, DEVC$RT.type((__CastType28<T> _) {
+  return new _AsBroadcastStream<T>(this, DEVC$RT.cast(onListen, DEVC$RT.type((__CastType29<T> _) {
     }
-  ), __CastType26, "CompositeCast", """line 248, column 44 of dart:async/stream.dart: """, onListen is __CastType26, false), DEVC$RT.cast(onCancel, DEVC$RT.type((__CastType28<T> _) {
+  ), __CastType27, "CompositeCast", """line 249, column 44 of dart:async/stream.dart: """, onListen is __CastType27, false), DEVC$RT.cast(onCancel, DEVC$RT.type((__CastType29<T> _) {
     }
-  ), __CastType26, "CompositeCast", """line 248, column 54 of dart:async/stream.dart: """, onCancel is __CastType26, false));
+  ), __CastType27, "CompositeCast", """line 249, column 54 of dart:async/stream.dart: """, onCancel is __CastType27, false));
   }
  StreamSubscription<T> listen(void onData(T event), {
   Function onError, void onDone(), bool cancelOnError}
 );
  Stream<T> where(bool test(T event)) {
   return new _WhereStream<T>(this, test);
   }
  Stream map(convert(T event)) {
   return new _MapStream<T, dynamic>(this, convert);
   }
@@ skipping 13 matching lines @@
         controller.addError(e, s);
          return;}
        if (newValue is Future) {
         subscription.pause();
          newValue.then(add, onError: addError).whenComplete(subscription.resume);
         }
        else {
         controller.add(newValue);
         }
       }
-    , onError: DEVC$RT.cast(addError, dynamic, Function, "DynamicCast", """line 338, column 20 of dart:async/stream.dart: """, addError is Function, true), onDone: controller.close);
+    , onError: DEVC$RT.cast(addError, dynamic, Function, "DynamicCast", """line 339, column 20 of dart:async/stream.dart: """, addError is Function, true), onDone: controller.close);
     }
    if (this.isBroadcast) {
     controller = new StreamController.broadcast(onListen: onListen, onCancel: () {
       subscription.cancel();
       }
     , sync: true);
     }
    else {
     controller = new StreamController(onListen: onListen, onPause: () {
       subscription.pause();
@@ skipping 19 matching lines @@
         newStream = convert(event);
         }
        catch (e, s) {
         controller.addError(e, s);
          return;}
        if (newStream != null) {
         subscription.pause();
          controller.addStream(newStream).whenComplete(subscription.resume);
         }
       }
-    , onError: DEVC$RT.cast(eventSink._addError, dynamic, Function, "DynamicCast", """line 395, column 20 of dart:async/stream.dart: """, eventSink._addError is Function, true), onDone: controller.close);
+    , onError: DEVC$RT.cast(eventSink._addError, dynamic, Function, "DynamicCast", """line 396, column 20 of dart:async/stream.dart: """, eventSink._addError is Function, true), onDone: controller.close);
     }
    if (this.isBroadcast) {
     controller = new StreamController.broadcast(onListen: onListen, onCancel: () {
       subscription.cancel();
       }
     , sync: true);
     }
    else {
     controller = new StreamController(onListen: onListen, onPause: () {
       subscription.pause();
@@ skipping 25 matching lines @@
  Future<T> reduce(T combine(T previous, T element)) {
   _Future<T> result = new _Future<T>();
    bool seenFirst = false;
    T value;
    StreamSubscription subscription;
    subscription = this.listen((T element) {
     if (seenFirst) {
       _runUserCode(() => combine(value, element), (T newValue) {
         value = newValue;
         }
-      , ((__x33) => DEVC$RT.cast(__x33, dynamic, __CastType30, "CompositeCast", """line 501, column 24 of dart:async/stream.dart: """, __x33 is __CastType30, false))(_cancelAndErrorClosure(subscription, result)));
+      , ((__x34) => DEVC$RT.cast(__x34, dynamic, __CastType31, "CompositeCast", """line 502, column 24 of dart:async/stream.dart: """, __x34 is __CastType31, false))(_cancelAndErrorClosure(subscription, result)));
       }
      else {
       value = element;
        seenFirst = true;
       }
     }
   , onError: result._completeError, onDone: () {
     if (!seenFirst) {
       try {
         throw IterableElementError.noElement();
@@ skipping 10 matching lines @@
    return result;
   }
  Future fold(var initialValue, combine(var previous, T element)) {
   _Future result = new _Future();
    var value = initialValue;
    StreamSubscription subscription;
    subscription = this.listen((T element) {
     _runUserCode(() => combine(value, element), (newValue) {
       value = newValue;
       }
-    , ((__x34) => DEVC$RT.cast(__x34, dynamic, __CastType30, "CompositeCast", """line 534, column 11 of dart:async/stream.dart: """, __x34 is __CastType30, false))(_cancelAndErrorClosure(subscription, result)));
+    , ((__x35) => DEVC$RT.cast(__x35, dynamic, __CastType31, "CompositeCast", """line 535, column 11 of dart:async/stream.dart: """, __x35 is __CastType31, false))(_cancelAndErrorClosure(subscription, result)));
     }
   , onError: (e, st) {
-    result._completeError(e, DEVC$RT.cast(st, dynamic, StackTrace, "DynamicCast", """line 538, column 34 of dart:async/stream.dart: """, st is StackTrace, true));
+    result._completeError(e, DEVC$RT.cast(st, dynamic, StackTrace, "DynamicCast", """line 539, column 34 of dart:async/stream.dart: """, st is StackTrace, true));
     }
   , onDone: () {
     result._complete(value);
     }
   , cancelOnError: true);
    return result;
   }
  Future<String> join([String separator = ""]) {
   _Future<String> result = new _Future<String>();
    StringBuffer buffer = new StringBuffer();
@@ skipping 22 matching lines @@
   }
  Future<bool> contains(Object needle) {
   _Future<bool> future = new _Future<bool>();
    StreamSubscription subscription;
    subscription = this.listen((T element) {
     _runUserCode(() => (element == needle), (bool isMatch) {
       if (isMatch) {
         _cancelAndValue(subscription, future, true);
         }
       }
-    , ((__x35) => DEVC$RT.cast(__x35, dynamic, __CastType30, "CompositeCast", """line 602, column 13 of dart:async/stream.dart: """, __x35 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x36) => DEVC$RT.cast(__x36, dynamic, __CastType31, "CompositeCast", """line 603, column 13 of dart:async/stream.dart: """, __x36 is __CastType31, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     future._complete(false);
     }
   , cancelOnError: true);
    return future;
   }
  Future forEach(void action(T element)) {
   _Future future = new _Future();
    StreamSubscription subscription;
    subscription = this.listen((T element) {
     _runUserCode(() => action(element), (_) {
       }
-    , ((__x36) => DEVC$RT.cast(__x36, dynamic, __CastType30, "CompositeCast", """line 628, column 13 of dart:async/stream.dart: """, __x36 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x37) => DEVC$RT.cast(__x37, dynamic, __CastType31, "CompositeCast", """line 629, column 13 of dart:async/stream.dart: """, __x37 is __CastType31, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     future._complete(null);
     }
   , cancelOnError: true);
    return future;
   }
  Future<bool> every(bool test(T element)) {
   _Future<bool> future = new _Future<bool>();
    StreamSubscription subscription;
    subscription = this.listen((T element) {
     _runUserCode(() => test(element), (bool isMatch) {
       if (!isMatch) {
         _cancelAndValue(subscription, future, false);
         }
       }
-    , ((__x37) => DEVC$RT.cast(__x37, dynamic, __CastType30, "CompositeCast", """line 657, column 13 of dart:async/stream.dart: """, __x37 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x38) => DEVC$RT.cast(__x38, dynamic, __CastType31, "CompositeCast", """line 658, column 13 of dart:async/stream.dart: """, __x38 is __CastType31, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     future._complete(true);
     }
   , cancelOnError: true);
    return future;
   }
  Future<bool> any(bool test(T element)) {
   _Future<bool> future = new _Future<bool>();
    StreamSubscription subscription;
    subscription = this.listen((T element) {
     _runUserCode(() => test(element), (bool isMatch) {
       if (isMatch) {
         _cancelAndValue(subscription, future, true);
         }
       }
-    , ((__x38) => DEVC$RT.cast(__x38, dynamic, __CastType30, "CompositeCast", """line 694, column 13 of dart:async/stream.dart: """, __x38 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x39) => DEVC$RT.cast(__x39, dynamic, __CastType31, "CompositeCast", """line 695, column 13 of dart:async/stream.dart: """, __x39 is __CastType31, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     future._complete(false);
     }
   , cancelOnError: true);
    return future;
   }
  Future<int> get length {
   _Future<int> future = new _Future<int>();
    int count = 0;
@@ skipping 133 matching lines @@
   Object defaultValue()}
 ) {
   _Future<dynamic> future = new _Future();
    StreamSubscription subscription;
    subscription = this.listen((T value) {
     _runUserCode(() => test(value), (bool isMatch) {
       if (isMatch) {
         _cancelAndValue(subscription, future, value);
         }
       }
-    , ((__x39) => DEVC$RT.cast(__x39, dynamic, __CastType30, "CompositeCast", """line 1036, column 11 of dart:async/stream.dart: """, __x39 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x40) => DEVC$RT.cast(__x40, dynamic, __CastType31, "CompositeCast", """line 1037, column 11 of dart:async/stream.dart: """, __x40 is __CastType31, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     if (defaultValue != null) {
       _runUserCode(defaultValue, future._complete, future._completeError);
        return;}
      try {
       throw IterableElementError.noElement();
       }
      catch (e, s) {
       _completeWithErrorCallback(future, e, s);
       }
     }
   , cancelOnError: true);
    return future;
   }
  Future<dynamic> lastWhere(bool test(T element), {
   Object defaultValue()}
 ) {
   _Future<dynamic> future = new _Future();
    T result = null;
    bool foundResult = false;
    StreamSubscription subscription;
    subscription = this.listen((T value) {
     _runUserCode(() => true == test(value), (bool isMatch) {
       if (isMatch) {
         foundResult = true;
          result = value;
         }
       }
-    , ((__x40) => DEVC$RT.cast(__x40, dynamic, __CastType30, "CompositeCast", """line 1077, column 11 of dart:async/stream.dart: """, __x40 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x41) => DEVC$RT.cast(__x41, dynamic, __CastType31, "CompositeCast", """line 1078, column 11 of dart:async/stream.dart: """, __x41 is __CastType31, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     if (foundResult) {
       future._complete(result);
        return;}
      if (defaultValue != null) {
       _runUserCode(defaultValue, future._complete, future._completeError);
        return;}
      try {
       throw IterableElementError.noElement();
@@ skipping 18 matching lines @@
             throw IterableElementError.tooMany();
             }
            catch (e, s) {
             _cancelAndErrorWithReplacement(subscription, future, e, s);
             }
            return;}
          foundResult = true;
          result = value;
         }
       }
-    , ((__x41) => DEVC$RT.cast(__x41, dynamic, __CastType30, "CompositeCast", """line 1129, column 11 of dart:async/stream.dart: """, __x41 is __CastType30, false))(_cancelAndErrorClosure(subscription, future)));
+    , ((__x42) => DEVC$RT.cast(__x42, dynamic, __CastType31, "CompositeCast", """line 1130, column 11 of dart:async/stream.dart: """, __x42 is __CastType31, false))(_cancelAndErrorClosure(subscription, future)));
     }
   , onError: future._completeError, onDone: () {
     if (foundResult) {
       future._complete(result);
        return;}
      try {
       throw IterableElementError.noElement();
       }
      catch (e, s) {
       _completeWithErrorCallback(future, e, s);
@@ skipping 23 matching lines @@
   void onTimeout(EventSink sink)}
 ) {
   StreamController controller;
    StreamSubscription<T> subscription;
    Timer timer;
    Zone zone;
    Function timeout;
    void onData(T event) {
     timer.cancel();
      controller.add(event);
-     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __CastType42, "CompositeCast", """line 1219, column 43 of dart:async/stream.dart: """, timeout is __CastType42, false));
+     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __CastType43, "CompositeCast", """line 1220, column 43 of dart:async/stream.dart: """, timeout is __CastType43, false));
     }
    void onError(error, StackTrace stackTrace) {
     timer.cancel();
      assert (controller is _StreamController || controller is _BroadcastStreamController); var eventSink = controller;
      eventSink._addError(error, stackTrace);
-     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __CastType42, "CompositeCast", """line 1227, column 43 of dart:async/stream.dart: """, timeout is __CastType42, false));
+     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __CastType43, "CompositeCast", """line 1228, column 43 of dart:async/stream.dart: """, timeout is __CastType43, false));
     }
    void onDone() {
     timer.cancel();
      controller.close();
     }
    void onListen() {
     zone = Zone.current;
      if (onTimeout == null) {
       timeout = () {
         controller.addError(new TimeoutException("No stream event", timeLimit), null);
         }
       ;
       }
      else {
-      onTimeout = ((__x45) => DEVC$RT.cast(__x45, ZoneUnaryCallback, __CastType43, "CompositeCast", """line 1245, column 21 of dart:async/stream.dart: """, __x45 is __CastType43, false))(zone.registerUnaryCallback(onTimeout));
+      onTimeout = ((__x46) => DEVC$RT.cast(__x46, ZoneUnaryCallback, __CastType44, "CompositeCast", """line 1246, column 21 of dart:async/stream.dart: """, __x46 is __CastType44, false))(zone.registerUnaryCallback(onTimeout));
        _ControllerEventSinkWrapper wrapper = new _ControllerEventSinkWrapper(null);
        timeout = () {
         wrapper._sink = controller;
          zone.runUnaryGuarded(onTimeout, wrapper);
          wrapper._sink = null;
         }
       ;
       }
      subscription = this.listen(onData, onError: onError, onDone: onDone);
-     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __CastType42, "CompositeCast", """line 1256, column 43 of dart:async/stream.dart: """, timeout is __CastType42, false));
+     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __CastType43, "CompositeCast", """line 1257, column 43 of dart:async/stream.dart: """, timeout is __CastType43, false));
     }
    Future onCancel() {
     timer.cancel();
      Future result = subscription.cancel();
      subscription = null;
      return result;
     }
    controller = isBroadcast ? new _SyncBroadcastStreamController(onListen, onCancel) : new _SyncStreamController(onListen, () {
     timer.cancel();
      subscription.pause();
     }
   , () {
     subscription.resume();
-     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __CastType42, "CompositeCast", """line 1275, column 53 of dart:async/stream.dart: """, timeout is __CastType42, false));
+     timer = zone.createTimer(timeLimit, DEVC$RT.cast(timeout, Function, __CastType43, "CompositeCast", """line 1276, column 53 of dart:async/stream.dart: """, timeout is __CastType43, false));
     }
   , onCancel);
    return controller.stream;
   }
 }
  abstract class StreamSubscription<T> {Future cancel();
  void onData(void handleData(T data));
  void onError(Function handleError);
  void onDone(void handleDone());
  void pause([Future resumeSignal]);
  void resume();
  bool get isPaused;
  Future asFuture([var futureValue]);
 }
  abstract class EventSink<T> implements Sink<T> {void add(T event);
  void addError(errorEvent, [StackTrace stackTrace]);
  void close();
 }
  class StreamView<T> extends Stream<T> {Stream<T> _stream;
  StreamView(this._stream);
  bool get isBroadcast => _stream.isBroadcast;
  Stream<T> asBroadcastStream({
-void onListen(StreamSubscription subscription), void onCancel(StreamSubscription subscription)}
+void onListen(StreamSubscription<T> subscription), void onCancel(StreamSubscription<T> subscription)}
 ) => _stream.asBroadcastStream(onListen: onListen, onCancel: onCancel);
  StreamSubscription<T> listen(void onData(T value), {
 Function onError, void onDone(), bool cancelOnError}
 ) {
 return _stream.listen(onData, onError: onError, onDone: onDone, cancelOnError: cancelOnError);
 }
 }
  abstract class StreamConsumer<S> {Future addStream(Stream<S> stream);
  Future close();
 }
@@ skipping 16 matching lines @@
  void add(T data) {
 _sink.add(data);
 }
  void addError(error, [StackTrace stackTrace]) {
 _sink.addError(error, stackTrace);
 }
  void close() {
 _sink.close();
 }
 }
- typedef T __CastType19<T>(int __u20);
- typedef dynamic __CastType21(dynamic __u22);
- typedef EventSink<dynamic> __CastType24<T>(EventSink<T> __u25);
- typedef void __CastType26(StreamSubscription<dynamic> __u27);
- typedef void __CastType28<T>(StreamSubscription<T> __u29);
- typedef dynamic __CastType30(dynamic __u31, StackTrace __u32);
- typedef void __CastType42();
- typedef void __CastType43(EventSink<dynamic> __u44);
+ typedef T __CastType20<T>(int __u21);
+ typedef dynamic __CastType22(dynamic __u23);
+ typedef EventSink<dynamic> __CastType25<T>(EventSink<T> __u26);
+ typedef void __CastType27(StreamSubscription<dynamic> __u28);
+ typedef void __CastType29<T>(StreamSubscription<T> __u30);
+ typedef dynamic __CastType31(dynamic __u32, StackTrace __u33);
+ typedef void __CastType43();
+ typedef void __CastType44(EventSink<dynamic> __u45);