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 482096443d61ffb80ceb7fcd04e4551685019bb8..7d487b03d7b88c4272346e847641e46a34b86a35 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() => ((__x167) => DDC$RT.cast(__x167, dynamic, String, "CastGeneral", """line 46, column 24 of dart:async/zone.dart: """, __x167 is String, true))(error.toString()); |
+ String toString() => ((__x167) => DEVC$RT.cast(__x167, dynamic, String, "CastGeneral", """line 46, column 24 of dart:async/zone.dart: """, __x167 is String, true))(error.toString()); |
} |
class _ZoneFunction {final _Zone zone; |
final Function function; |
@@ -30,7 +30,7 @@ dynamic handleUncaughtError(Zone self, ZoneDelegate parent, Zone zone, error, St |
factory ZoneSpecification.from(ZoneSpecification other, { |
dynamic handleUncaughtError(Zone self, ZoneDelegate parent, Zone zone, error, StackTrace stackTrace) : null, dynamic run(Zone self, ZoneDelegate parent, Zone zone, f()) : null, dynamic runUnary(Zone self, ZoneDelegate parent, Zone zone, f(arg), arg) : null, dynamic runBinary(Zone self, ZoneDelegate parent, Zone zone, f(arg1, arg2), arg1, arg2) : null, ZoneCallback registerCallback(Zone self, ZoneDelegate parent, Zone zone, f()) : null, ZoneUnaryCallback registerUnaryCallback(Zone self, ZoneDelegate parent, Zone zone, f(arg)) : null, ZoneBinaryCallback registerBinaryCallback(Zone self, ZoneDelegate parent, Zone zone, f(arg1, arg2)) : null, AsyncError errorCallback(Zone self, ZoneDelegate parent, Zone zone, Object error, StackTrace stackTrace), void scheduleMicrotask(Zone self, ZoneDelegate parent, Zone zone, f()) : null, Timer createTimer(Zone self, ZoneDelegate parent, Zone zone, Duration duration, void f()) : null, Timer createPeriodicTimer(Zone self, ZoneDelegate parent, Zone zone, Duration period, void f(Timer timer)) : null, void print(Zone self, ZoneDelegate parent, Zone zone, String line) : null, Zone fork(Zone self, ZoneDelegate parent, Zone zone, ZoneSpecification specification, Map zoneValues) : null} |
) { |
-return new ZoneSpecification(handleUncaughtError: ((__x174) => DDC$RT.cast(__x174, dynamic, __t168, "CastGeneral", """line 138, column 28 of dart:async/zone.dart: """, __x174 is __t168, false))(handleUncaughtError != null ? handleUncaughtError : other.handleUncaughtError), run: ((__x180) => DDC$RT.cast(__x180, dynamic, __t175, "CastGeneral", """line 141, column 12 of dart:async/zone.dart: """, __x180 is __t175, false))(run != null ? run : other.run), runUnary: ((__x188) => DDC$RT.cast(__x188, dynamic, __t181, "CastGeneral", """line 142, column 17 of dart:async/zone.dart: """, __x188 is __t181, false))(runUnary != null ? runUnary : other.runUnary), runBinary: ((__x198) => DDC$RT.cast(__x198, dynamic, __t189, "CastGeneral", """line 143, column 18 of dart:async/zone.dart: """, __x198 is __t189, false))(runBinary != null ? runBinary : other.runBinary), registerCallback: ((__x205) => DDC$RT.cast(__x205, dynamic, __t199, "CastGeneral", """line 144, column 25 of dart:async/zone.dart: """, __x205 is __t199, false))(registerCallback != null ? registerCallback : other.registerCallback), registerUnaryCallback: ((__x214) => DDC$RT.cast(__x214, dynamic, __t206, "CastGeneral", """line 147, column 30 of dart:async/zone.dart: """, __x214 is __t206, false))(registerUnaryCallback != null ? registerUnaryCallback : other.registerUnaryCallback), registerBinaryCallback: ((__x225) => DDC$RT.cast(__x225, dynamic, __t215, "CastGeneral", """line 150, column 31 of dart:async/zone.dart: """, __x225 is __t215, false))(registerBinaryCallback != null ? registerBinaryCallback : other.registerBinaryCallback), errorCallback: ((__x232) => DDC$RT.cast(__x232, dynamic, __t226, "CastGeneral", """line 153, column 22 of dart:async/zone.dart: """, __x232 is __t226, false))(errorCallback != null ? errorCallback : other.errorCallback), scheduleMicrotask: ((__x238) => DDC$RT.cast(__x238, dynamic, __t233, "CastGeneral", """line 156, column 26 of dart:async/zone.dart: """, __x238 is __t233, false))(scheduleMicrotask != null ? scheduleMicrotask : other.scheduleMicrotask), createTimer: ((__x245) => DDC$RT.cast(__x245, dynamic, __t239, "CastGeneral", """line 159, column 21 of dart:async/zone.dart: """, __x245 is __t239, false))(createTimer != null ? createTimer : other.createTimer), createPeriodicTimer: ((__x253) => DDC$RT.cast(__x253, dynamic, __t246, "CastGeneral", """line 160, column 28 of dart:async/zone.dart: """, __x253 is __t246, false))(createPeriodicTimer != null ? createPeriodicTimer : other.createPeriodicTimer), print: ((__x259) => DDC$RT.cast(__x259, dynamic, __t254, "CastGeneral", """line 163, column 15 of dart:async/zone.dart: """, __x259 is __t254, false))(print != null ? print : other.print), fork: ((__x266) => DDC$RT.cast(__x266, dynamic, __t260, "CastGeneral", """line 164, column 13 of dart:async/zone.dart: """, __x266 is __t260, false))(fork != null ? fork : other.fork)); |
+return new ZoneSpecification(handleUncaughtError: ((__x174) => DEVC$RT.cast(__x174, dynamic, __t168, "CastGeneral", """line 138, column 28 of dart:async/zone.dart: """, __x174 is __t168, false))(handleUncaughtError != null ? handleUncaughtError : other.handleUncaughtError), run: ((__x180) => DEVC$RT.cast(__x180, dynamic, __t175, "CastGeneral", """line 141, column 12 of dart:async/zone.dart: """, __x180 is __t175, false))(run != null ? run : other.run), runUnary: ((__x188) => DEVC$RT.cast(__x188, dynamic, __t181, "CastGeneral", """line 142, column 17 of dart:async/zone.dart: """, __x188 is __t181, false))(runUnary != null ? runUnary : other.runUnary), runBinary: ((__x198) => DEVC$RT.cast(__x198, dynamic, __t189, "CastGeneral", """line 143, column 18 of dart:async/zone.dart: """, __x198 is __t189, false))(runBinary != null ? runBinary : other.runBinary), registerCallback: ((__x205) => DEVC$RT.cast(__x205, dynamic, __t199, "CastGeneral", """line 144, column 25 of dart:async/zone.dart: """, __x205 is __t199, false))(registerCallback != null ? registerCallback : other.registerCallback), registerUnaryCallback: ((__x214) => DEVC$RT.cast(__x214, dynamic, __t206, "CastGeneral", """line 147, column 30 of dart:async/zone.dart: """, __x214 is __t206, false))(registerUnaryCallback != null ? registerUnaryCallback : other.registerUnaryCallback), registerBinaryCallback: ((__x225) => DEVC$RT.cast(__x225, dynamic, __t215, "CastGeneral", """line 150, column 31 of dart:async/zone.dart: """, __x225 is __t215, false))(registerBinaryCallback != null ? registerBinaryCallback : other.registerBinaryCallback), errorCallback: ((__x232) => DEVC$RT.cast(__x232, dynamic, __t226, "CastGeneral", """line 153, column 22 of dart:async/zone.dart: """, __x232 is __t226, false))(errorCallback != null ? errorCallback : other.errorCallback), scheduleMicrotask: ((__x238) => DEVC$RT.cast(__x238, dynamic, __t233, "CastGeneral", """line 156, column 26 of dart:async/zone.dart: """, __x238 is __t233, false))(scheduleMicrotask != null ? scheduleMicrotask : other.scheduleMicrotask), createTimer: ((__x245) => DEVC$RT.cast(__x245, dynamic, __t239, "CastGeneral", """line 159, column 21 of dart:async/zone.dart: """, __x245 is __t239, false))(createTimer != null ? createTimer : other.createTimer), createPeriodicTimer: ((__x253) => DEVC$RT.cast(__x253, dynamic, __t246, "CastGeneral", """line 160, column 28 of dart:async/zone.dart: """, __x253 is __t246, false))(createPeriodicTimer != null ? createPeriodicTimer : other.createPeriodicTimer), print: ((__x259) => DEVC$RT.cast(__x259, dynamic, __t254, "CastGeneral", """line 163, column 15 of dart:async/zone.dart: """, __x259 is __t254, false))(print != null ? print : other.print), fork: ((__x266) => DEVC$RT.cast(__x266, dynamic, __t260, "CastGeneral", """line 164, column 13 of dart:async/zone.dart: """, __x266 is __t260, false))(fork != null ? fork : other.fork)); |
} |
HandleUncaughtErrorHandler get handleUncaughtError; |
RunHandler get run; |
@@ -79,7 +79,7 @@ this.handleUncaughtError : null, this.run : null, this.runUnary : null, this.run |
} |
abstract class Zone {Zone._(); |
static const Zone ROOT = _ROOT_ZONE; |
- static Zone _current = DDC$RT.cast(_ROOT_ZONE, dynamic, Zone, "CastGeneral", """line 262, column 26 of dart:async/zone.dart: """, _ROOT_ZONE is Zone, true); |
+ static Zone _current = DEVC$RT.cast(_ROOT_ZONE, dynamic, Zone, "CastGeneral", """line 262, column 26 of dart:async/zone.dart: """, _ROOT_ZONE is Zone, true); |
static Zone get current => _current; |
dynamic handleUncaughtError(error, StackTrace stackTrace); |
Zone get parent; |
@@ -150,23 +150,23 @@ _ZoneFunction implementation = _delegationTarget._runBinary; |
ZoneCallback registerCallback(Zone zone, f()) { |
_ZoneFunction implementation = _delegationTarget._registerCallback; |
_Zone implZone = implementation.zone; |
- return ((__x267) => DDC$RT.cast(__x267, dynamic, __t204, "CastGeneral", """line 522, column 12 of dart:async/zone.dart: """, __x267 is __t204, false))((implementation.function)(implZone, _parentDelegate(implZone), zone, f)); |
+ return ((__x267) => DEVC$RT.cast(__x267, dynamic, __t204, "CastGeneral", """line 522, column 12 of dart:async/zone.dart: """, __x267 is __t204, false))((implementation.function)(implZone, _parentDelegate(implZone), zone, f)); |
} |
ZoneUnaryCallback registerUnaryCallback(Zone zone, f(arg)) { |
_ZoneFunction implementation = _delegationTarget._registerUnaryCallback; |
_Zone implZone = implementation.zone; |
- return ((__x268) => DDC$RT.cast(__x268, dynamic, __t212, "CastGeneral", """line 529, column 12 of dart:async/zone.dart: """, __x268 is __t212, false))((implementation.function)(implZone, _parentDelegate(implZone), zone, f)); |
+ return ((__x268) => DEVC$RT.cast(__x268, dynamic, __t212, "CastGeneral", """line 529, column 12 of dart:async/zone.dart: """, __x268 is __t212, false))((implementation.function)(implZone, _parentDelegate(implZone), zone, f)); |
} |
ZoneBinaryCallback registerBinaryCallback(Zone zone, f(arg1, arg2)) { |
_ZoneFunction implementation = _delegationTarget._registerBinaryCallback; |
_Zone implZone = implementation.zone; |
- return ((__x269) => DDC$RT.cast(__x269, dynamic, __t222, "CastGeneral", """line 536, column 12 of dart:async/zone.dart: """, __x269 is __t222, false))((implementation.function)(implZone, _parentDelegate(implZone), zone, f)); |
+ return ((__x269) => DEVC$RT.cast(__x269, dynamic, __t222, "CastGeneral", """line 536, column 12 of dart:async/zone.dart: """, __x269 is __t222, 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 ((__x270) => DDC$RT.cast(__x270, dynamic, AsyncError, "CastGeneral", """line 544, column 12 of dart:async/zone.dart: """, __x270 is AsyncError, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, error, stackTrace)); |
+ return ((__x270) => DEVC$RT.cast(__x270, dynamic, AsyncError, "CastGeneral", """line 544, column 12 of dart:async/zone.dart: """, __x270 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 ((__x271) => DDC$RT.cast(__x271, dynamic, Timer, "CastGeneral", """line 558, column 12 of dart:async/zone.dart: """, __x271 is Timer, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, duration, f)); |
+ return ((__x271) => DEVC$RT.cast(__x271, dynamic, Timer, "CastGeneral", """line 558, column 12 of dart:async/zone.dart: """, __x271 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 ((__x272) => DDC$RT.cast(__x272, dynamic, Timer, "CastGeneral", """line 565, column 12 of dart:async/zone.dart: """, __x272 is Timer, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, period, f)); |
+ return ((__x272) => DEVC$RT.cast(__x272, dynamic, Timer, "CastGeneral", """line 565, column 12 of dart:async/zone.dart: """, __x272 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 ((__x273) => DDC$RT.cast(__x273, dynamic, Zone, "CastGeneral", """line 580, column 12 of dart:async/zone.dart: """, __x273 is Zone, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, specification, zoneValues)); |
+ return ((__x273) => DEVC$RT.cast(__x273, dynamic, Zone, "CastGeneral", """line 580, column 12 of dart:async/zone.dart: """, __x273 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 ((__x274) => DDC$RT.cast(__x274, dynamic, Zone, "CastGeneral", """line 787, column 12 of dart:async/zone.dart: """, __x274 is Zone, true))((implementation.function)(implementation.zone, parentDelegate, this, specification, zoneValues)); |
+ return ((__x274) => DEVC$RT.cast(__x274, dynamic, Zone, "CastGeneral", """line 787, column 12 of dart:async/zone.dart: """, __x274 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 ((__x275) => DDC$RT.cast(__x275, dynamic, __t204, "CastGeneral", """line 820, column 12 of dart:async/zone.dart: """, __x275 is __t204, false))((implementation.function)(implementation.zone, parentDelegate, this, f)); |
+ return ((__x275) => DEVC$RT.cast(__x275, dynamic, __t204, "CastGeneral", """line 820, column 12 of dart:async/zone.dart: """, __x275 is __t204, 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 ((__x276) => DDC$RT.cast(__x276, dynamic, __t212, "CastGeneral", """line 828, column 12 of dart:async/zone.dart: """, __x276 is __t212, false))((implementation.function)(implementation.zone, parentDelegate, this, f)); |
+ return ((__x276) => DEVC$RT.cast(__x276, dynamic, __t212, "CastGeneral", """line 828, column 12 of dart:async/zone.dart: """, __x276 is __t212, 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 ((__x277) => DDC$RT.cast(__x277, dynamic, __t222, "CastGeneral", """line 836, column 12 of dart:async/zone.dart: """, __x277 is __t222, false))((implementation.function)(implementation.zone, parentDelegate, this, f)); |
+ return ((__x277) => DEVC$RT.cast(__x277, dynamic, __t222, "CastGeneral", """line 836, column 12 of dart:async/zone.dart: """, __x277 is __t222, 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 ((__x278) => DDC$RT.cast(__x278, dynamic, AsyncError, "CastGeneral", """line 846, column 12 of dart:async/zone.dart: """, __x278 is AsyncError, true))((implementation.function)(implementationZone, parentDelegate, this, error, stackTrace)); |
+ final ZoneDelegate parentDelegate = _parentDelegate(DEVC$RT.cast(implementationZone, Zone, _Zone, "CastGeneral", """line 845, column 57 of dart:async/zone.dart: """, implementationZone is _Zone, true)); |
+ return ((__x278) => DEVC$RT.cast(__x278, dynamic, AsyncError, "CastGeneral", """line 846, column 12 of dart:async/zone.dart: """, __x278 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 ((__x279) => DDC$RT.cast(__x279, dynamic, Timer, "CastGeneral", """line 862, column 12 of dart:async/zone.dart: """, __x279 is Timer, true))((implementation.function)(implementation.zone, parentDelegate, this, duration, f)); |
+ return ((__x279) => DEVC$RT.cast(__x279, dynamic, Timer, "CastGeneral", """line 862, column 12 of dart:async/zone.dart: """, __x279 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 ((__x280) => DDC$RT.cast(__x280, dynamic, Timer, "CastGeneral", """line 870, column 12 of dart:async/zone.dart: """, __x280 is Timer, true))((implementation.function)(implementation.zone, parentDelegate, this, duration, f)); |
+ return ((__x280) => DEVC$RT.cast(__x280, dynamic, Timer, "CastGeneral", """line 870, column 12 of dart:async/zone.dart: """, __x280 is Timer, true))((implementation.function)(implementation.zone, parentDelegate, this, duration, f)); |
} |
void print(String line) { |
_ZoneFunction implementation = this._print; |
@@ -452,8 +452,8 @@ 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 __u281)) { |
-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)); |
+callback = zone.bindUnaryCallback(DEVC$RT.wrap((void f(Timer __u281)) { |
+void c(Timer x0) => f(DEVC$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, __t282, __t212, "Wrap", """line 962, column 39 of dart:async/zone.dart: """, callback is __t212)); |
@@ -486,7 +486,7 @@ valueMap = new HashMap(); |
else { |
valueMap = new HashMap.from(zoneValues); |
} |
- return new _CustomZone(DDC$RT.cast(zone, Zone, _Zone, "CastGeneral", """line 999, column 26 of dart:async/zone.dart: """, zone is _Zone, true), specification, valueMap); |
+ return new _CustomZone(DEVC$RT.cast(zone, Zone, _Zone, "CastGeneral", """line 999, column 26 of dart:async/zone.dart: """, zone is _Zone, true), specification, valueMap); |
} |
class _RootZoneSpecification implements ZoneSpecification {HandleUncaughtErrorHandler get handleUncaughtError => _rootHandleUncaughtError; |
RunHandler get run => _rootRun; |
@@ -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, __t212, "CastGeneral", """line 1228, column 37 of dart:async/zone.dart: """, onError is __t212, false), error); |
+ return self.parent.runUnary(DEVC$RT.cast(onError, Function, __t212, "CastGeneral", """line 1228, column 37 of dart:async/zone.dart: """, onError is __t212, false), error); |
} |
catch (e, s) { |
if (identical(e, error)) { |