| Index: test/dart_codegen/expect/async/future_impl.dart
|
| diff --git a/test/dart_codegen/expect/async/future_impl.dart b/test/dart_codegen/expect/async/future_impl.dart
|
| index e2b25b552eb883c472960446c5f017a883230619..ca02ca20d4e615b04a992575b9192264c76cf258 100644
|
| --- a/test/dart_codegen/expect/async/future_impl.dart
|
| +++ b/test/dart_codegen/expect/async/future_impl.dart
|
| @@ -58,14 +58,14 @@ future._completeError(error, stackTrace);
|
| bool get hasErrorTest => (state == STATE_CATCHERROR_TEST);
|
| bool get handlesComplete => (state == STATE_WHENCOMPLETE);
|
| _FutureOnValue get _onValue {
|
| -assert (handlesValue); return DEVC$RT.cast(callback, Function, __t11, "ImplicitCast", """line 112, column 12 of dart:async/future_impl.dart: """, callback is __t11, true);
|
| +assert (handlesValue); return DEVC$RT.cast(callback, Function, __t10, "ImplicitCast", """line 112, column 12 of dart:async/future_impl.dart: """, callback is __t10, true);
|
| }
|
| Function get _onError => errorCallback;
|
| _FutureErrorTest get _errorTest {
|
| -assert (hasErrorTest); return DEVC$RT.cast(callback, Function, __t13, "CompositeCast", """line 117, column 12 of dart:async/future_impl.dart: """, callback is __t13, false);
|
| +assert (hasErrorTest); return DEVC$RT.cast(callback, Function, __t12, "CompositeCast", """line 117, column 12 of dart:async/future_impl.dart: """, callback is __t12, false);
|
| }
|
| _FutureAction get _whenCompleteAction {
|
| -assert (handlesComplete); return DEVC$RT.cast(callback, Function, __t15, "ImplicitCast", """line 121, column 12 of dart:async/future_impl.dart: """, callback is __t15, true);
|
| +assert (handlesComplete); return DEVC$RT.cast(callback, Function, __t14, "ImplicitCast", """line 121, column 12 of dart:async/future_impl.dart: """, callback is __t14, true);
|
| }
|
| }
|
| class _Future<T> implements Future<T> {static const int _INCOMPLETE = 0;
|
| @@ -101,13 +101,9 @@ Function onError}
|
| ) {
|
| _Future result = new _Future();
|
| if (!identical(result._zone, _ROOT_ZONE)) {
|
| -f = ((__x19) => DEVC$RT.wrap((dynamic f(dynamic __u16)) {
|
| -dynamic c(dynamic x0) => f(x0);
|
| - return f == null ? null : c;
|
| +f = ((__x17) => DEVC$RT.cast(__x17, __t10, DEVC$RT.type((__t15<T> _) {
|
| }
|
| -, __x19, __t11, DEVC$RT.type((__t17<T> _) {
|
| -}
|
| -), "Wrap", """line 208, column 11 of dart:async/future_impl.dart: """, __x19 is __t17<T>))(result._zone.registerUnaryCallback(f));
|
| +), "CompositeCast", """line 208, column 11 of dart:async/future_impl.dart: """, __x17 is __t15<T>, false))(result._zone.registerUnaryCallback(f));
|
| if (onError != null) {
|
| onError = _registerErrorHandler(onError, result._zone);
|
| }
|
| @@ -121,11 +117,7 @@ bool test(error)}
|
| _Future result = new _Future();
|
| if (!identical(result._zone, _ROOT_ZONE)) {
|
| onError = _registerErrorHandler(onError, result._zone);
|
| - if (test != null) test = ((__x22) => DEVC$RT.wrap((dynamic f(dynamic __u21)) {
|
| -dynamic c(dynamic x0) => ((__x20) => DEVC$RT.cast(__x20, dynamic, bool, "CastResult", """line 221, column 32 of dart:async/future_impl.dart: """, __x20 is bool, true))(f(x0));
|
| - return f == null ? null : c;
|
| -}
|
| -, __x22, __t11, __t13, "Wrap", """line 221, column 32 of dart:async/future_impl.dart: """, __x22 is __t13))(result._zone.registerUnaryCallback(test));
|
| + if (test != null) test = ((__x18) => DEVC$RT.cast(__x18, __t10, __t12, "CompositeCast", """line 221, column 32 of dart:async/future_impl.dart: """, __x18 is __t12, false))(result._zone.registerUnaryCallback(test));
|
| }
|
| _addListener(new _FutureListener.catchError(result, onError, test));
|
| return result;
|
| @@ -327,7 +319,7 @@ AsyncError asyncError = source._error;
|
| if (listener.hasErrorTest) {
|
| _FutureErrorTest test = listener._errorTest;
|
| try {
|
| - matchesTest = ((__x23) => DEVC$RT.cast(__x23, dynamic, bool, "DynamicCast", """line 499, column 29 of dart:async/future_impl.dart: """, __x23 is bool, true))(zone.runUnary(test, asyncError.error));
|
| + matchesTest = ((__x19) => DEVC$RT.cast(__x19, dynamic, bool, "DynamicCast", """line 499, column 29 of dart:async/future_impl.dart: """, __x19 is bool, true))(zone.runUnary(test, asyncError.error));
|
| }
|
| catch (e, s) {
|
| listenerValueOrError = identical(asyncError.error, e) ? asyncError : new AsyncError(e, s);
|
| @@ -341,7 +333,7 @@ AsyncError asyncError = source._error;
|
| listenerValueOrError = zone.runBinary(errorCallback, asyncError.error, asyncError.stackTrace);
|
| }
|
| else {
|
| - listenerValueOrError = zone.runUnary(DEVC$RT.cast(errorCallback, Function, __t11, "ImplicitCast", """line 515, column 54 of dart:async/future_impl.dart: """, errorCallback is __t11, true), asyncError.error);
|
| + listenerValueOrError = zone.runUnary(DEVC$RT.cast(errorCallback, Function, __t10, "ImplicitCast", """line 515, column 54 of dart:async/future_impl.dart: """, errorCallback is __t10, true), asyncError.error);
|
| }
|
| }
|
| catch (e, s) {
|
| @@ -474,7 +466,7 @@ timer.cancel();
|
| return result;
|
| }
|
| }
|
| - typedef dynamic __t11(dynamic __u12);
|
| - typedef bool __t13(dynamic __u14);
|
| - typedef dynamic __t15();
|
| - typedef dynamic __t17<T>(T __u18);
|
| + typedef dynamic __t10(dynamic __u11);
|
| + typedef bool __t12(dynamic __u13);
|
| + typedef dynamic __t14();
|
| + typedef dynamic __t15<T>(T __u16);
|
|
|