| 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 c51d9f904a5eccc80a2c2a27c051665ab88cf95d..ec5f0f95f8f59c5bae3aa22b76f903dafe441005 100644
|
| --- a/test/dart_codegen/expect/async/zone.dart
|
| +++ b/test/dart_codegen/expect/async/zone.dart
|
| @@ -32,9 +32,9 @@ class AsyncError implements Error {
|
| final error;
|
| final StackTrace stackTrace;
|
| AsyncError(this.error, this.stackTrace);
|
| - String toString() => ((__x133) => DDC$RT.cast(__x133, dynamic, String,
|
| + String toString() => ((__x131) => DDC$RT.cast(__x131, dynamic, String,
|
| "CastGeneral", """line 46, column 24 of dart:async/zone.dart: """,
|
| - __x133 is String, true))(error.toString());
|
| + __x131 is String, true))(error.toString());
|
| }
|
| class _ZoneFunction {
|
| final _Zone zone;
|
| @@ -242,34 +242,34 @@ class _ZoneDelegate implements ZoneDelegate {
|
| ZoneCallback registerCallback(Zone zone, f()) {
|
| _ZoneFunction implementation = _delegationTarget._registerCallback;
|
| _Zone implZone = implementation.zone;
|
| - return ((__x135) => DDC$RT.cast(__x135, dynamic, __t134, "CastGeneral",
|
| + return ((__x133) => DDC$RT.cast(__x133, dynamic, __t132, "CastGeneral",
|
| """line 522, column 12 of dart:async/zone.dart: """,
|
| - __x135 is __t134, false))((implementation.function)(
|
| + __x133 is __t132, false))((implementation.function)(
|
| implZone, _parentDelegate(implZone), zone, f));
|
| }
|
| ZoneUnaryCallback registerUnaryCallback(Zone zone, f(arg)) {
|
| _ZoneFunction implementation = _delegationTarget._registerUnaryCallback;
|
| _Zone implZone = implementation.zone;
|
| - return ((__x138) => DDC$RT.cast(__x138, dynamic, __t136, "CastGeneral",
|
| + return ((__x136) => DDC$RT.cast(__x136, dynamic, __t134, "CastGeneral",
|
| """line 529, column 12 of dart:async/zone.dart: """,
|
| - __x138 is __t136, false))((implementation.function)(
|
| + __x136 is __t134, false))((implementation.function)(
|
| implZone, _parentDelegate(implZone), zone, f));
|
| }
|
| ZoneBinaryCallback registerBinaryCallback(Zone zone, f(arg1, arg2)) {
|
| _ZoneFunction implementation = _delegationTarget._registerBinaryCallback;
|
| _Zone implZone = implementation.zone;
|
| - return ((__x142) => DDC$RT.cast(__x142, dynamic, __t139, "CastGeneral",
|
| + return ((__x140) => DDC$RT.cast(__x140, dynamic, __t137, "CastGeneral",
|
| """line 536, column 12 of dart:async/zone.dart: """,
|
| - __x142 is __t139, false))((implementation.function)(
|
| + __x140 is __t137, 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 ((__x143) => DDC$RT.cast(__x143, dynamic, AsyncError, "CastGeneral",
|
| + return ((__x141) => DDC$RT.cast(__x141, dynamic, AsyncError, "CastGeneral",
|
| """line 544, column 12 of dart:async/zone.dart: """,
|
| - __x143 is AsyncError, true))((implementation.function)(
|
| + __x141 is AsyncError, true))((implementation.function)(
|
| implZone, _parentDelegate(implZone), zone, error, stackTrace));
|
| }
|
| void scheduleMicrotask(Zone zone, f()) {
|
| @@ -280,17 +280,17 @@ class _ZoneDelegate implements ZoneDelegate {
|
| Timer createTimer(Zone zone, Duration duration, void f()) {
|
| _ZoneFunction implementation = _delegationTarget._createTimer;
|
| _Zone implZone = implementation.zone;
|
| - return ((__x144) => DDC$RT.cast(__x144, dynamic, Timer, "CastGeneral",
|
| + return ((__x142) => DDC$RT.cast(__x142, dynamic, Timer, "CastGeneral",
|
| """line 558, column 12 of dart:async/zone.dart: """,
|
| - __x144 is Timer, true))((implementation.function)(
|
| + __x142 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 ((__x145) => DDC$RT.cast(__x145, dynamic, Timer, "CastGeneral",
|
| + return ((__x143) => DDC$RT.cast(__x143, dynamic, Timer, "CastGeneral",
|
| """line 565, column 12 of dart:async/zone.dart: """,
|
| - __x145 is Timer, true))((implementation.function)(
|
| + __x143 is Timer, true))((implementation.function)(
|
| implZone, _parentDelegate(implZone), zone, period, f));
|
| }
|
| void print(Zone zone, String line) {
|
| @@ -301,8 +301,8 @@ class _ZoneDelegate implements ZoneDelegate {
|
| Zone fork(Zone zone, ZoneSpecification specification, Map zoneValues) {
|
| _ZoneFunction implementation = _delegationTarget._fork;
|
| _Zone implZone = implementation.zone;
|
| - return ((__x146) => DDC$RT.cast(__x146, dynamic, Zone, "CastGeneral",
|
| - """line 580, column 12 of dart:async/zone.dart: """, __x146 is 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));
|
| }
|
| @@ -464,8 +464,8 @@ class _CustomZone extends _Zone {
|
| _ZoneFunction implementation = this._fork;
|
| assert(implementation != null);
|
| ZoneDelegate parentDelegate = _parentDelegate(implementation.zone);
|
| - return ((__x147) => DDC$RT.cast(__x147, dynamic, Zone, "CastGeneral",
|
| - """line 787, column 12 of dart:async/zone.dart: """, __x147 is 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));
|
| }
|
| @@ -494,27 +494,27 @@ class _CustomZone extends _Zone {
|
| _ZoneFunction implementation = this._registerCallback;
|
| assert(implementation != null);
|
| ZoneDelegate parentDelegate = _parentDelegate(implementation.zone);
|
| - return ((__x148) => DDC$RT.cast(__x148, dynamic, __t134, "CastGeneral",
|
| + return ((__x146) => DDC$RT.cast(__x146, dynamic, __t132, "CastGeneral",
|
| """line 820, column 12 of dart:async/zone.dart: """,
|
| - __x148 is __t134, false))((implementation.function)(
|
| + __x146 is __t132, 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 ((__x149) => DDC$RT.cast(__x149, dynamic, __t136, "CastGeneral",
|
| + return ((__x147) => DDC$RT.cast(__x147, dynamic, __t134, "CastGeneral",
|
| """line 828, column 12 of dart:async/zone.dart: """,
|
| - __x149 is __t136, false))((implementation.function)(
|
| + __x147 is __t134, 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 ((__x150) => DDC$RT.cast(__x150, dynamic, __t139, "CastGeneral",
|
| + return ((__x148) => DDC$RT.cast(__x148, dynamic, __t137, "CastGeneral",
|
| """line 836, column 12 of dart:async/zone.dart: """,
|
| - __x150 is __t139, false))((implementation.function)(
|
| + __x148 is __t137, false))((implementation.function)(
|
| implementation.zone, parentDelegate, this, f));
|
| }
|
| AsyncError errorCallback(Object error, StackTrace stackTrace) {
|
| @@ -526,9 +526,9 @@ class _CustomZone extends _Zone {
|
| implementationZone, Zone, _Zone, "CastGeneral",
|
| """line 845, column 57 of dart:async/zone.dart: """,
|
| implementationZone is _Zone, true));
|
| - return ((__x151) => DDC$RT.cast(__x151, dynamic, AsyncError, "CastGeneral",
|
| + return ((__x149) => DDC$RT.cast(__x149, dynamic, AsyncError, "CastGeneral",
|
| """line 846, column 12 of dart:async/zone.dart: """,
|
| - __x151 is AsyncError, true))((implementation.function)(
|
| + __x149 is AsyncError, true))((implementation.function)(
|
| implementationZone, parentDelegate, this, error, stackTrace));
|
| }
|
| void scheduleMicrotask(void f()) {
|
| @@ -542,18 +542,18 @@ class _CustomZone extends _Zone {
|
| _ZoneFunction implementation = this._createTimer;
|
| assert(implementation != null);
|
| ZoneDelegate parentDelegate = _parentDelegate(implementation.zone);
|
| - return ((__x152) => DDC$RT.cast(__x152, dynamic, Timer, "CastGeneral",
|
| + return ((__x150) => DDC$RT.cast(__x150, dynamic, Timer, "CastGeneral",
|
| """line 862, column 12 of dart:async/zone.dart: """,
|
| - __x152 is Timer, true))((implementation.function)(
|
| + __x150 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 ((__x153) => DDC$RT.cast(__x153, dynamic, Timer, "CastGeneral",
|
| + return ((__x151) => DDC$RT.cast(__x151, dynamic, Timer, "CastGeneral",
|
| """line 870, column 12 of dart:async/zone.dart: """,
|
| - __x153 is Timer, true))((implementation.function)(
|
| + __x151 is Timer, true))((implementation.function)(
|
| implementation.zone, parentDelegate, this, duration, f));
|
| }
|
| void print(String line) {
|
| @@ -629,14 +629,14 @@ Timer _rootCreateTimer(Zone self, ZoneDelegate parent, Zone zone,
|
| 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 __u154)) {
|
| + callback = zone.bindUnaryCallback(DDC$RT.wrap((void f(Timer __u152)) {
|
| 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, __t155, __t136, "Wrap",
|
| + }, callback, __t153, __t134, "Wrap",
|
| """line 962, column 39 of dart:async/zone.dart: """,
|
| - callback is __t136));
|
| + callback is __t134));
|
| }
|
| return Timer._createPeriodicTimer(duration, callback);
|
| }
|
| @@ -818,9 +818,9 @@ dynamic runZoned(body(),
|
| if (onError is ZoneBinaryCallback) {
|
| return self.parent.runBinary(onError, error, stackTrace);
|
| }
|
| - return self.parent.runUnary(DDC$RT.cast(onError, Function, __t136,
|
| + return self.parent.runUnary(DDC$RT.cast(onError, Function, __t134,
|
| "CastGeneral", """line 1228, column 37 of dart:async/zone.dart: """,
|
| - onError is __t136, false), error);
|
| + onError is __t134, false), error);
|
| } catch (e, s) {
|
| if (identical(e, error)) {
|
| return parent.handleUncaughtError(zone, error, stackTrace);
|
| @@ -845,7 +845,7 @@ dynamic runZoned(body(),
|
| return zone.run(body);
|
| }
|
| }
|
| -typedef dynamic __t134();
|
| -typedef dynamic __t136(dynamic __u137);
|
| -typedef dynamic __t139(dynamic __u140, dynamic __u141);
|
| -typedef void __t155(Timer __u156);
|
| +typedef dynamic __t132();
|
| +typedef dynamic __t134(dynamic __u135);
|
| +typedef dynamic __t137(dynamic __u138, dynamic __u139);
|
| +typedef void __t153(Timer __u154);
|
|
|