Typing fixes to eliminate casts/dcalls

test/dart_codegen/expect/async/zone.dart

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 852da4cf12e7910981eb66d00d6d06be3fccf34a..ef80f673e4044c375fd341494126116adfe80489 100644
--- a/test/dart_codegen/expect/async/zone.dart
+++ b/test/dart_codegen/expect/async/zone.dart
@@ -150,23 +150,23 @@ _ZoneFunction implementation = _delegationTarget._runBinary;
  ZoneCallback registerCallback(Zone zone, f()) {
 _ZoneFunction implementation = _delegationTarget._registerCallback;
  _Zone implZone = implementation.zone;
- return ((__x84) => DEVC$RT.cast(__x84, dynamic, ZoneCallback, "DynamicCast", """line 522, column 12 of dart:async/zone.dart: """, __x84 is ZoneCallback, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, f));
+ return ((__x79) => DEVC$RT.cast(__x79, dynamic, ZoneCallback, "DynamicCast", """line 522, column 12 of dart:async/zone.dart: """, __x79 is ZoneCallback, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, f));
 }
  ZoneUnaryCallback registerUnaryCallback(Zone zone, f(arg)) {
 _ZoneFunction implementation = _delegationTarget._registerUnaryCallback;
  _Zone implZone = implementation.zone;
- return ((__x85) => DEVC$RT.cast(__x85, dynamic, ZoneUnaryCallback, "DynamicCast", """line 529, column 12 of dart:async/zone.dart: """, __x85 is ZoneUnaryCallback, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, f));
+ return ((__x80) => DEVC$RT.cast(__x80, dynamic, ZoneUnaryCallback, "DynamicCast", """line 529, column 12 of dart:async/zone.dart: """, __x80 is ZoneUnaryCallback, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, f));
 }
  ZoneBinaryCallback registerBinaryCallback(Zone zone, f(arg1, arg2)) {
 _ZoneFunction implementation = _delegationTarget._registerBinaryCallback;
  _Zone implZone = implementation.zone;
- return ((__x86) => DEVC$RT.cast(__x86, dynamic, ZoneBinaryCallback, "DynamicCast", """line 536, column 12 of dart:async/zone.dart: """, __x86 is ZoneBinaryCallback, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, f));
+ return ((__x81) => DEVC$RT.cast(__x81, dynamic, ZoneBinaryCallback, "DynamicCast", """line 536, column 12 of dart:async/zone.dart: """, __x81 is ZoneBinaryCallback, true))((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 ((__x87) => DEVC$RT.cast(__x87, dynamic, AsyncError, "DynamicCast", """line 544, column 12 of dart:async/zone.dart: """, __x87 is AsyncError, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, error, stackTrace));
+ return ((__x82) => DEVC$RT.cast(__x82, dynamic, AsyncError, "DynamicCast", """line 544, column 12 of dart:async/zone.dart: """, __x82 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 ((__x88) => DEVC$RT.cast(__x88, dynamic, Timer, "DynamicCast", """line 558, column 12 of dart:async/zone.dart: """, __x88 is Timer, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, duration, f));
+ return ((__x83) => DEVC$RT.cast(__x83, dynamic, Timer, "DynamicCast", """line 558, column 12 of dart:async/zone.dart: """, __x83 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 ((__x89) => DEVC$RT.cast(__x89, dynamic, Timer, "DynamicCast", """line 565, column 12 of dart:async/zone.dart: """, __x89 is Timer, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, period, f));
+ return ((__x84) => DEVC$RT.cast(__x84, dynamic, Timer, "DynamicCast", """line 565, column 12 of dart:async/zone.dart: """, __x84 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 ((__x90) => DEVC$RT.cast(__x90, dynamic, Zone, "DynamicCast", """line 580, column 12 of dart:async/zone.dart: """, __x90 is Zone, true))((implementation.function)(implZone, _parentDelegate(implZone), zone, specification, zoneValues));
+ return ((__x85) => DEVC$RT.cast(__x85, dynamic, Zone, "DynamicCast", """line 580, column 12 of dart:async/zone.dart: """, __x85 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 ((__x91) => DEVC$RT.cast(__x91, dynamic, Zone, "DynamicCast", """line 787, column 12 of dart:async/zone.dart: """, __x91 is Zone, true))((implementation.function)(implementation.zone, parentDelegate, this, specification, zoneValues));
+ return ((__x86) => DEVC$RT.cast(__x86, dynamic, Zone, "DynamicCast", """line 787, column 12 of dart:async/zone.dart: """, __x86 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 ((__x92) => DEVC$RT.cast(__x92, dynamic, ZoneCallback, "DynamicCast", """line 820, column 12 of dart:async/zone.dart: """, __x92 is ZoneCallback, true))((implementation.function)(implementation.zone, parentDelegate, this, f));
+ return ((__x87) => DEVC$RT.cast(__x87, dynamic, ZoneCallback, "DynamicCast", """line 820, column 12 of dart:async/zone.dart: """, __x87 is ZoneCallback, true))((implementation.function)(implementation.zone, parentDelegate, this, f));
 }
  ZoneUnaryCallback registerUnaryCallback(f(arg)) {
 _ZoneFunction implementation = this._registerUnaryCallback;
  assert (implementation != null); ZoneDelegate parentDelegate = _parentDelegate(implementation.zone);
- return ((__x93) => DEVC$RT.cast(__x93, dynamic, ZoneUnaryCallback, "DynamicCast", """line 828, column 12 of dart:async/zone.dart: """, __x93 is ZoneUnaryCallback, true))((implementation.function)(implementation.zone, parentDelegate, this, f));
+ return ((__x88) => DEVC$RT.cast(__x88, dynamic, ZoneUnaryCallback, "DynamicCast", """line 828, column 12 of dart:async/zone.dart: """, __x88 is ZoneUnaryCallback, true))((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 ((__x94) => DEVC$RT.cast(__x94, dynamic, ZoneBinaryCallback, "DynamicCast", """line 836, column 12 of dart:async/zone.dart: """, __x94 is ZoneBinaryCallback, true))((implementation.function)(implementation.zone, parentDelegate, this, f));
+ return ((__x89) => DEVC$RT.cast(__x89, dynamic, ZoneBinaryCallback, "DynamicCast", """line 836, column 12 of dart:async/zone.dart: """, __x89 is ZoneBinaryCallback, true))((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(DEVC$RT.cast(implementationZone, Zone, _Zone, "ImplicitCast", """line 845, column 57 of dart:async/zone.dart: """, implementationZone is _Zone, true));
- return ((__x95) => DEVC$RT.cast(__x95, dynamic, AsyncError, "DynamicCast", """line 846, column 12 of dart:async/zone.dart: """, __x95 is AsyncError, true))((implementation.function)(implementationZone, parentDelegate, this, error, stackTrace));
+ return ((__x90) => DEVC$RT.cast(__x90, dynamic, AsyncError, "DynamicCast", """line 846, column 12 of dart:async/zone.dart: """, __x90 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 ((__x96) => DEVC$RT.cast(__x96, dynamic, Timer, "DynamicCast", """line 862, column 12 of dart:async/zone.dart: """, __x96 is Timer, true))((implementation.function)(implementation.zone, parentDelegate, this, duration, f));
+ return ((__x91) => DEVC$RT.cast(__x91, dynamic, Timer, "DynamicCast", """line 862, column 12 of dart:async/zone.dart: """, __x91 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 ((__x97) => DEVC$RT.cast(__x97, dynamic, Timer, "DynamicCast", """line 870, column 12 of dart:async/zone.dart: """, __x97 is Timer, true))((implementation.function)(implementation.zone, parentDelegate, this, duration, f));
+ return ((__x92) => DEVC$RT.cast(__x92, dynamic, Timer, "DynamicCast", """line 870, column 12 of dart:async/zone.dart: """, __x92 is Timer, true))((implementation.function)(implementation.zone, parentDelegate, this, duration, f));
 }
  void print(String line) {
 _ZoneFunction implementation = this._print;
@@ -452,7 +452,7 @@ callback = zone.bindCallback(callback);
 }
  Timer _rootCreatePeriodicTimer(Zone self, ZoneDelegate parent, Zone zone, Duration duration, void callback(Timer timer)) {
 if (!identical(_ROOT_ZONE, zone)) {
-callback = ((__x100) => DEVC$RT.cast(__x100, ZoneUnaryCallback, __CastType98, "CompositeCast", """line 962, column 16 of dart:async/zone.dart: """, __x100 is __CastType98, false))(zone.bindUnaryCallback(callback));
+callback = ((__x95) => DEVC$RT.cast(__x95, ZoneUnaryCallback, __CastType93, "CompositeCast", """line 962, column 16 of dart:async/zone.dart: """, __x95 is __CastType93, false))(zone.bindUnaryCallback(callback));
 }
  return Timer._createPeriodicTimer(duration, callback);
 }
@@ -633,7 +633,7 @@ try {
 if (onError is ZoneBinaryCallback) {
 return self.parent.runBinary(onError, error, stackTrace);
 }
- return self.parent.runUnary(DEVC$RT.cast(onError, Function, __CastType101, "ImplicitCast", """line 1228, column 37 of dart:async/zone.dart: """, onError is __CastType101, true), error);
+ return self.parent.runUnary(DEVC$RT.cast(onError, Function, __CastType96, "ImplicitCast", """line 1228, column 37 of dart:async/zone.dart: """, onError is __CastType96, true), error);
 }
  catch (e, s) {
 if (identical(e, error)) {
@@ -660,5 +660,5 @@ return zone.runGuarded(body);
 return zone.run(body);
 }
 }
- typedef void __CastType98(Timer __u99);
- typedef dynamic __CastType101(dynamic __u102);
+ typedef void __CastType93(Timer __u94);
+ typedef dynamic __CastType96(dynamic __u97);