| Index: test/dart_codegen/expect/async/zone.dart
|
| diff --git a/test/dart_codegen/expect/async/zone.dart b/test/dart_codegen/expect/async/zone.dart
|
| index 3d899dc15cc7d2b54ae92f303a5aeeafc630aae6..4e39d240d29b71dd03011ac5ff3151e3ecfd3970 100644
|
| --- a/test/dart_codegen/expect/async/zone.dart
|
| +++ b/test/dart_codegen/expect/async/zone.dart
|
| @@ -18,7 +18,7 @@ part of dart.async;
|
| class AsyncError implements Error {final error;
|
| final StackTrace stackTrace;
|
| AsyncError(this.error, this.stackTrace);
|
| - String toString() => ((__x131) => DDC$RT.cast(__x131, dynamic, String, "CastGeneral", """line 46, column 24 of dart:async/zone.dart: """, __x131 is String, true))(error.toString());
|
| + String toString() => ((__x136) => DDC$RT.cast(__x136, dynamic, String, "CastGeneral", """line 46, column 24 of dart:async/zone.dart: """, __x136 is String, true))(error.toString());
|
| }
|
| class _ZoneFunction {final _Zone zone;
|
| final Function function;
|
| @@ -150,23 +150,23 @@ _ZoneFunction implementation = _delegationTarget._runBinary;
|
| ZoneCallback registerCallback(Zone zone, f()) {
|
| _ZoneFunction implementation = _delegationTarget._registerCallback;
|
| _Zone implZone = implementation.zone;
|
| - return ((__x133) => DDC$RT.cast(__x133, dynamic, __t132, "CastGeneral", """line 522, column 12 of dart:async/zone.dart: """, __x133 is __t132, false))((implementation.function)(implZone, _parentDelegate(implZone), zone, f));
|
| + return ((__x138) => DDC$RT.cast(__x138, dynamic, __t137, "CastGeneral", """line 522, column 12 of dart:async/zone.dart: """, __x138 is __t137, false))((implementation.function)(implZone, _parentDelegate(implZone), zone, f));
|
| }
|
| ZoneUnaryCallback registerUnaryCallback(Zone zone, f(arg)) {
|
| _ZoneFunction implementation = _delegationTarget._registerUnaryCallback;
|
| _Zone implZone = implementation.zone;
|
| - return ((__x136) => DDC$RT.cast(__x136, dynamic, __t134, "CastGeneral", """line 529, column 12 of dart:async/zone.dart: """, __x136 is __t134, false))((implementation.function)(implZone, _parentDelegate(implZone), zone, f));
|
| + return ((__x141) => DDC$RT.cast(__x141, dynamic, __t139, "CastGeneral", """line 529, column 12 of dart:async/zone.dart: """, __x141 is __t139, false))((implementation.function)(implZone, _parentDelegate(implZone), zone, f));
|
| }
|
| ZoneBinaryCallback registerBinaryCallback(Zone zone, f(arg1, arg2)) {
|
| _ZoneFunction implementation = _delegationTarget._registerBinaryCallback;
|
| _Zone implZone = implementation.zone;
|
| - return ((__x140) => DDC$RT.cast(__x140, dynamic, __t137, "CastGeneral", """line 536, column 12 of dart:async/zone.dart: """, __x140 is __t137, false))((implementation.function)(implZone, _parentDelegate(implZone), zone, f));
|
| + return ((__x145) => DDC$RT.cast(__x145, dynamic, __t142, "CastGeneral", """line 536, column 12 of dart:async/zone.dart: """, __x145 is __t142, false))((implementation.function)(implZone, _parentDelegate(implZone), zone, f));
|
| }
|
| AsyncError errorCallback(Zone zone, Object error, StackTrace stackTrace) {
|
| _ZoneFunction implementation = _delegationTarget._errorCallback;
|
| _Zone implZone = implementation.zone;
|
| if (identical(implZone, _ROOT_ZONE)) return null;
|
| - return ((__x141) => DDC$RT.cast(__x141, dynamic, AsyncError, "CastGeneral", """line 544, column 12 of dart:async/zone.dart: """, __x141 is AsyncError, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, error, stackTrace));
|
| + return ((__x146) => DDC$RT.cast(__x146, dynamic, AsyncError, "CastGeneral", """line 544, column 12 of dart:async/zone.dart: """, __x146 is AsyncError, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, error, stackTrace));
|
| }
|
| void scheduleMicrotask(Zone zone, f()) {
|
| _ZoneFunction implementation = _delegationTarget._scheduleMicrotask;
|
| @@ -176,12 +176,12 @@ _ZoneFunction implementation = _delegationTarget._scheduleMicrotask;
|
| Timer createTimer(Zone zone, Duration duration, void f()) {
|
| _ZoneFunction implementation = _delegationTarget._createTimer;
|
| _Zone implZone = implementation.zone;
|
| - return ((__x142) => DDC$RT.cast(__x142, dynamic, Timer, "CastGeneral", """line 558, column 12 of dart:async/zone.dart: """, __x142 is Timer, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, duration, f));
|
| + return ((__x147) => DDC$RT.cast(__x147, dynamic, Timer, "CastGeneral", """line 558, column 12 of dart:async/zone.dart: """, __x147 is Timer, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, duration, f));
|
| }
|
| Timer createPeriodicTimer(Zone zone, Duration period, void f(Timer timer)) {
|
| _ZoneFunction implementation = _delegationTarget._createPeriodicTimer;
|
| _Zone implZone = implementation.zone;
|
| - return ((__x143) => DDC$RT.cast(__x143, dynamic, Timer, "CastGeneral", """line 565, column 12 of dart:async/zone.dart: """, __x143 is Timer, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, period, f));
|
| + return ((__x148) => DDC$RT.cast(__x148, dynamic, Timer, "CastGeneral", """line 565, column 12 of dart:async/zone.dart: """, __x148 is Timer, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, period, f));
|
| }
|
| void print(Zone zone, String line) {
|
| _ZoneFunction implementation = _delegationTarget._print;
|
| @@ -191,7 +191,7 @@ _ZoneFunction implementation = _delegationTarget._print;
|
| Zone fork(Zone zone, ZoneSpecification specification, Map zoneValues) {
|
| _ZoneFunction implementation = _delegationTarget._fork;
|
| _Zone implZone = implementation.zone;
|
| - return ((__x144) => DDC$RT.cast(__x144, dynamic, Zone, "CastGeneral", """line 580, column 12 of dart:async/zone.dart: """, __x144 is Zone, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, specification, zoneValues));
|
| + return ((__x149) => DDC$RT.cast(__x149, dynamic, Zone, "CastGeneral", """line 580, column 12 of dart:async/zone.dart: """, __x149 is Zone, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, specification, zoneValues));
|
| }
|
| }
|
| abstract class _Zone implements Zone {const _Zone();
|
| @@ -331,7 +331,7 @@ ZoneSpecification specification, Map zoneValues}
|
| ) {
|
| _ZoneFunction implementation = this._fork;
|
| assert (implementation != null); ZoneDelegate parentDelegate = _parentDelegate(implementation.zone);
|
| - return ((__x145) => DDC$RT.cast(__x145, dynamic, Zone, "CastGeneral", """line 787, column 12 of dart:async/zone.dart: """, __x145 is Zone, true))((implementation.function)(implementation.zone, parentDelegate, this, specification, zoneValues));
|
| + return ((__x150) => DDC$RT.cast(__x150, dynamic, Zone, "CastGeneral", """line 787, column 12 of dart:async/zone.dart: """, __x150 is Zone, true))((implementation.function)(implementation.zone, parentDelegate, this, specification, zoneValues));
|
| }
|
| dynamic run(f()) {
|
| _ZoneFunction implementation = this._run;
|
| @@ -351,24 +351,24 @@ _ZoneFunction implementation = this._runBinary;
|
| ZoneCallback registerCallback(f()) {
|
| _ZoneFunction implementation = this._registerCallback;
|
| assert (implementation != null); ZoneDelegate parentDelegate = _parentDelegate(implementation.zone);
|
| - return ((__x146) => DDC$RT.cast(__x146, dynamic, __t132, "CastGeneral", """line 820, column 12 of dart:async/zone.dart: """, __x146 is __t132, false))((implementation.function)(implementation.zone, parentDelegate, this, f));
|
| + return ((__x151) => DDC$RT.cast(__x151, dynamic, __t137, "CastGeneral", """line 820, column 12 of dart:async/zone.dart: """, __x151 is __t137, false))((implementation.function)(implementation.zone, parentDelegate, this, f));
|
| }
|
| ZoneUnaryCallback registerUnaryCallback(f(arg)) {
|
| _ZoneFunction implementation = this._registerUnaryCallback;
|
| assert (implementation != null); ZoneDelegate parentDelegate = _parentDelegate(implementation.zone);
|
| - return ((__x147) => DDC$RT.cast(__x147, dynamic, __t134, "CastGeneral", """line 828, column 12 of dart:async/zone.dart: """, __x147 is __t134, false))((implementation.function)(implementation.zone, parentDelegate, this, f));
|
| + return ((__x152) => DDC$RT.cast(__x152, dynamic, __t139, "CastGeneral", """line 828, column 12 of dart:async/zone.dart: """, __x152 is __t139, false))((implementation.function)(implementation.zone, parentDelegate, this, f));
|
| }
|
| ZoneBinaryCallback registerBinaryCallback(f(arg1, arg2)) {
|
| _ZoneFunction implementation = this._registerBinaryCallback;
|
| assert (implementation != null); ZoneDelegate parentDelegate = _parentDelegate(implementation.zone);
|
| - return ((__x148) => DDC$RT.cast(__x148, dynamic, __t137, "CastGeneral", """line 836, column 12 of dart:async/zone.dart: """, __x148 is __t137, false))((implementation.function)(implementation.zone, parentDelegate, this, f));
|
| + return ((__x153) => DDC$RT.cast(__x153, dynamic, __t142, "CastGeneral", """line 836, column 12 of dart:async/zone.dart: """, __x153 is __t142, false))((implementation.function)(implementation.zone, parentDelegate, this, f));
|
| }
|
| AsyncError errorCallback(Object error, StackTrace stackTrace) {
|
| final _ZoneFunction implementation = this._errorCallback;
|
| assert (implementation != null); final Zone implementationZone = implementation.zone;
|
| if (identical(implementationZone, _ROOT_ZONE)) return null;
|
| final ZoneDelegate parentDelegate = _parentDelegate(DDC$RT.cast(implementationZone, Zone, _Zone, "CastGeneral", """line 845, column 57 of dart:async/zone.dart: """, implementationZone is _Zone, true));
|
| - return ((__x149) => DDC$RT.cast(__x149, dynamic, AsyncError, "CastGeneral", """line 846, column 12 of dart:async/zone.dart: """, __x149 is AsyncError, true))((implementation.function)(implementationZone, parentDelegate, this, error, stackTrace));
|
| + return ((__x154) => DDC$RT.cast(__x154, dynamic, AsyncError, "CastGeneral", """line 846, column 12 of dart:async/zone.dart: """, __x154 is AsyncError, true))((implementation.function)(implementationZone, parentDelegate, this, error, stackTrace));
|
| }
|
| void scheduleMicrotask(void f()) {
|
| _ZoneFunction implementation = this._scheduleMicrotask;
|
| @@ -378,12 +378,12 @@ _ZoneFunction implementation = this._scheduleMicrotask;
|
| Timer createTimer(Duration duration, void f()) {
|
| _ZoneFunction implementation = this._createTimer;
|
| assert (implementation != null); ZoneDelegate parentDelegate = _parentDelegate(implementation.zone);
|
| - return ((__x150) => DDC$RT.cast(__x150, dynamic, Timer, "CastGeneral", """line 862, column 12 of dart:async/zone.dart: """, __x150 is Timer, true))((implementation.function)(implementation.zone, parentDelegate, this, duration, f));
|
| + return ((__x155) => DDC$RT.cast(__x155, dynamic, Timer, "CastGeneral", """line 862, column 12 of dart:async/zone.dart: """, __x155 is Timer, true))((implementation.function)(implementation.zone, parentDelegate, this, duration, f));
|
| }
|
| Timer createPeriodicTimer(Duration duration, void f(Timer timer)) {
|
| _ZoneFunction implementation = this._createPeriodicTimer;
|
| assert (implementation != null); ZoneDelegate parentDelegate = _parentDelegate(implementation.zone);
|
| - return ((__x151) => DDC$RT.cast(__x151, dynamic, Timer, "CastGeneral", """line 870, column 12 of dart:async/zone.dart: """, __x151 is Timer, true))((implementation.function)(implementation.zone, parentDelegate, this, duration, f));
|
| + return ((__x156) => DDC$RT.cast(__x156, dynamic, Timer, "CastGeneral", """line 870, column 12 of dart:async/zone.dart: """, __x156 is Timer, true))((implementation.function)(implementation.zone, parentDelegate, this, duration, f));
|
| }
|
| void print(String line) {
|
| _ZoneFunction implementation = this._print;
|
| @@ -452,11 +452,11 @@ callback = zone.bindCallback(callback);
|
| }
|
| Timer _rootCreatePeriodicTimer(Zone self, ZoneDelegate parent, Zone zone, Duration duration, void callback(Timer timer)) {
|
| if (!identical(_ROOT_ZONE, zone)) {
|
| -callback = zone.bindUnaryCallback(DDC$RT.wrap((void f(Timer __u152)) {
|
| +callback = zone.bindUnaryCallback(DDC$RT.wrap((void f(Timer __u157)) {
|
| void c(Timer x0) => f(DDC$RT.cast(x0, dynamic, Timer, "CastParam", """line 962, column 39 of dart:async/zone.dart: """, x0 is Timer, true));
|
| return f == null ? null : c;
|
| }
|
| -, callback, __t153, __t134, "Wrap", """line 962, column 39 of dart:async/zone.dart: """, callback is __t134));
|
| +, callback, __t158, __t139, "Wrap", """line 962, column 39 of dart:async/zone.dart: """, callback is __t139));
|
| }
|
| return Timer._createPeriodicTimer(duration, callback);
|
| }
|
| @@ -637,7 +637,7 @@ try {
|
| if (onError is ZoneBinaryCallback) {
|
| return self.parent.runBinary(onError, error, stackTrace);
|
| }
|
| - return self.parent.runUnary(DDC$RT.cast(onError, Function, __t134, "CastGeneral", """line 1228, column 37 of dart:async/zone.dart: """, onError is __t134, false), error);
|
| + return self.parent.runUnary(DDC$RT.cast(onError, Function, __t139, "CastGeneral", """line 1228, column 37 of dart:async/zone.dart: """, onError is __t139, false), error);
|
| }
|
| catch (e, s) {
|
| if (identical(e, error)) {
|
| @@ -664,7 +664,7 @@ return zone.runGuarded(body);
|
| return zone.run(body);
|
| }
|
| }
|
| - typedef dynamic __t132();
|
| - typedef dynamic __t134(dynamic __u135);
|
| - typedef dynamic __t137(dynamic __u138, dynamic __u139);
|
| - typedef void __t153(Timer __u154);
|
| + typedef dynamic __t137();
|
| + typedef dynamic __t139(dynamic __u140);
|
| + typedef dynamic __t142(dynamic __u143, dynamic __u144);
|
| + typedef void __t158(Timer __u159);
|
|
|