| Index: tests/language/function_type/function_type46_test.dart
 | 
| diff --git a/tests/language/function_type/function_type46_test.dart b/tests/language/function_type/function_type46_test.dart
 | 
| index 388766eefb2483d034d90439c176aabe4a29734c..4e2bf9539fec45449bca3213f4ad9c630495689e 100644
 | 
| --- a/tests/language/function_type/function_type46_test.dart
 | 
| +++ b/tests/language/function_type/function_type46_test.dart
 | 
| @@ -19,64 +19,43 @@ import 'package:expect/expect.dart';
 | 
|  @AssumeDynamic()
 | 
|  confuse(f) => f;
 | 
|  
 | 
| -final bool inCheckedMode = (() {
 | 
| -  bool result = false;
 | 
| -  assert(result = true);
 | 
| -  return result;
 | 
| -})();
 | 
| -
 | 
| -typedef F0<T>
 | 
| -    = int Function(int x0, [List<T> x]);
 | 
| -typedef F1<T>
 | 
| -    = List<Function> Function([core.List<core.int> x]);
 | 
| -typedef F2<T>
 | 
| -    = List<T> Function(List<Function> x);
 | 
| -typedef F3<T>
 | 
| -    = void Function(int y, {int x});
 | 
| -typedef F4<T>
 | 
| -    = A Function<A>(A x);
 | 
| -typedef F5<T>
 | 
| -    = int Function(int x1, {Function x}) Function<B extends core.int>();
 | 
| -typedef F6<T>
 | 
| -    = int Function([List<T> x]) Function<B extends core.int>();
 | 
| -typedef F7<T>
 | 
| -    = Function Function(int y, [Function x]) Function<B extends core.int>();
 | 
| -typedef F8<T>
 | 
| -    = Function Function(int x2,
 | 
| -        [core.List<core.int> x3]) Function<B extends core.int>();
 | 
| -typedef F9<T>
 | 
| -    = List<Function> Function({int x}) Function<B extends core.int>();
 | 
| -typedef F10<T>
 | 
| -    = List<Function> Function(
 | 
| -        core.List<core.int> x) Function<B extends core.int>();
 | 
| -typedef F11<T>
 | 
| -    = core.List<core.int> Function(int x1,
 | 
| -        [int x]) Function<B extends core.int>();
 | 
| -typedef F12<T>
 | 
| -    = core.List<core.int> Function(
 | 
| -        [List<Function> x1]) Function<B extends core.int>();
 | 
| -typedef F13<T>
 | 
| -    = core.List<core.int> Function({List<T> x}) Function<B extends core.int>();
 | 
| -typedef F14<T>
 | 
| -    = List<T> Function(int y, {Function x}) Function<B extends core.int>();
 | 
| -typedef F15<T>
 | 
| -    = List<T> Function(int x1, [List<T> x]) Function<B extends core.int>();
 | 
| -typedef F16<T>
 | 
| -    = Function(Function x1) Function<B extends core.int>();
 | 
| -typedef F17<T>
 | 
| -    = Function(int x, [core.List<core.int> x1]) Function<B extends core.int>();
 | 
| -typedef F18<T>
 | 
| -    = void Function(int x1, {int x}) Function<B extends core.int>();
 | 
| -typedef F19<T>
 | 
| -    = void Function([core.List<core.int> x]) Function<B extends core.int>();
 | 
| -typedef F20<T>
 | 
| -    = int Function<A>(core.List<core.int> x) Function<B extends core.int>();
 | 
| -typedef F21<T>
 | 
| -    = core.List<core.int> Function<A>(List<T> x) Function<B extends core.int>();
 | 
| -typedef F22<T>
 | 
| -    = A Function<A>() Function<B extends core.int>();
 | 
| -typedef F23<T>
 | 
| -    = B Function(List<T> x) Function<B extends core.int>();
 | 
| +typedef F0<T> = int Function(int x0, [List<T> x]);
 | 
| +typedef F1<T> = List<Function> Function([core.List<core.int> x]);
 | 
| +typedef F2<T> = List<T> Function(List<Function> x);
 | 
| +typedef F3<T> = void Function(int y, {int x});
 | 
| +typedef F4<T> = A Function<A>(A x);
 | 
| +typedef F5<T> = int Function(int x1, {Function x})
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F6<T> = int Function([List<T> x]) Function<B extends core.int>();
 | 
| +typedef F7<T> = Function Function(int y, [Function x])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F8<T> = Function Function(int x2, [core.List<core.int> x3])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F9<T> = List<Function> Function({int x}) Function<B extends core.int>();
 | 
| +typedef F10<T> = List<Function> Function(core.List<core.int> x)
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F11<T> = core.List<core.int> Function(int x1, [int x])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F12<T> = core.List<core.int> Function([List<Function> x1])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F13<T> = core.List<core.int> Function({List<T> x})
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F14<T> = List<T> Function(int y, {Function x})
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F15<T> = List<T> Function(int x1, [List<T> x])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F16<T> = Function(Function x1) Function<B extends core.int>();
 | 
| +typedef F17<T> = Function(int x, [core.List<core.int> x1])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F18<T> = void Function(int x1, {int x}) Function<B extends core.int>();
 | 
| +typedef F19<T> = void Function([core.List<core.int> x])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F20<T> = int Function<A>(core.List<core.int> x)
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F21<T> = core.List<core.int> Function<A>(List<T> x)
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F22<T> = A Function<A>() Function<B extends core.int>();
 | 
| +typedef F23<T> = B Function(List<T> x) Function<B extends core.int>();
 | 
|  
 | 
|  int f0(int x0, [List<int> x]) => null;
 | 
|  List<Function> f1([core.List<core.int> x]) => null;
 | 
| @@ -119,15 +98,15 @@ class U46<T> {
 | 
|    int Function(int x1, {Function x}) Function<B extends core.int>() x5;
 | 
|    int Function([List<T> x]) Function<B extends core.int>() x6;
 | 
|    Function Function(int y, [Function x]) Function<B extends core.int>() x7;
 | 
| -  Function Function(int x2,
 | 
| -      [core.List<core.int> x3]) Function<B extends core.int>() x8;
 | 
| +  Function Function(int x2, [core.List<core.int> x3])
 | 
| +      Function<B extends core.int>() x8;
 | 
|    List<Function> Function({int x}) Function<B extends core.int>() x9;
 | 
|    List<Function> Function(core.List<core.int> x) Function<B extends core.int>()
 | 
|        x10;
 | 
|    core.List<core.int> Function(int x1, [int x]) Function<B extends core.int>()
 | 
|        x11;
 | 
| -  core.List<core.int> Function(
 | 
| -      [List<Function> x1]) Function<B extends core.int>() x12;
 | 
| +  core.List<core.int> Function([List<Function> x1])
 | 
| +      Function<B extends core.int>() x12;
 | 
|    core.List<core.int> Function({List<T> x}) Function<B extends core.int>() x13;
 | 
|    List<T> Function(int y, {Function x}) Function<B extends core.int>() x14;
 | 
|    List<T> Function(int x1, [List<T> x]) Function<B extends core.int>() x15;
 | 
| @@ -229,7 +208,7 @@ class U46<T> {
 | 
|        Expect.equals(tIsDynamic, m0 is F0<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m0) is F0<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x0 = (f0 as dynamic);
 | 
|          });
 | 
| @@ -305,7 +284,7 @@ class U46<T> {
 | 
|        Expect.equals(tIsDynamic, m2 is F2<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m2) is F2<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x2 = (f2 as dynamic);
 | 
|          });
 | 
| @@ -390,8 +369,8 @@ class U46<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m5 is F5);
 | 
| -    Expect.isTrue(m5 is int Function(int x1,
 | 
| -        {Function x}) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m5 is int Function(int x1, {Function x})
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m5) is F5);
 | 
|      // In checked mode, verifies the type.
 | 
|      x5 = m5;
 | 
| @@ -431,7 +410,7 @@ class U46<T> {
 | 
|        Expect.equals(tIsDynamic, m6 is F6<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m6) is F6<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x6 = (f6 as dynamic);
 | 
|          });
 | 
| @@ -468,8 +447,8 @@ class U46<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m7 is F7);
 | 
| -    Expect.isTrue(m7 is Function Function(int y,
 | 
| -        [Function x]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m7 is Function Function(int y, [Function x])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m7) is F7);
 | 
|      // In checked mode, verifies the type.
 | 
|      x7 = m7;
 | 
| @@ -483,8 +462,8 @@ class U46<T> {
 | 
|      Expect.isTrue(f8 is F8);
 | 
|      Expect.isTrue(confuse(f8) is F8);
 | 
|      // In checked mode, verifies the type.
 | 
| -    Function Function(int x2,
 | 
| -        [core.List<core.int> x3]) Function<B extends core.int>() l8;
 | 
| +    Function Function(int x2, [core.List<core.int> x3])
 | 
| +        Function<B extends core.int>() l8;
 | 
|      // The static function f8 sets `T` to `int`.
 | 
|      if (!tIsBool) {
 | 
|        x8 = f8 as dynamic;
 | 
| @@ -494,8 +473,8 @@ class U46<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m8 is F8);
 | 
| -    Expect.isTrue(m8 is Function Function(int x2,
 | 
| -        [core.List<core.int> x3]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m8 is Function Function(int x2, [core.List<core.int> x3])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m8) is F8);
 | 
|      // In checked mode, verifies the type.
 | 
|      x8 = m8;
 | 
| @@ -534,8 +513,8 @@ class U46<T> {
 | 
|      Expect.isTrue(f10 is F10);
 | 
|      Expect.isTrue(confuse(f10) is F10);
 | 
|      // In checked mode, verifies the type.
 | 
| -    List<Function> Function(
 | 
| -        core.List<core.int> x) Function<B extends core.int>() l10;
 | 
| +    List<Function> Function(core.List<core.int> x)
 | 
| +        Function<B extends core.int>() l10;
 | 
|      // The static function f10 sets `T` to `int`.
 | 
|      if (!tIsBool) {
 | 
|        x10 = f10 as dynamic;
 | 
| @@ -545,8 +524,8 @@ class U46<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m10 is F10);
 | 
| -    Expect.isTrue(m10 is List<Function> Function(
 | 
| -        core.List<core.int> x) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m10 is List<Function> Function(core.List<core.int> x)
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m10) is F10);
 | 
|      // In checked mode, verifies the type.
 | 
|      x10 = m10;
 | 
| @@ -571,8 +550,8 @@ class U46<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m11 is F11);
 | 
| -    Expect.isTrue(m11 is core.List<core.int> Function(int x1,
 | 
| -        [int x]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m11 is core.List<core.int> Function(int x1, [int x])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m11) is F11);
 | 
|      // In checked mode, verifies the type.
 | 
|      x11 = m11;
 | 
| @@ -586,8 +565,8 @@ class U46<T> {
 | 
|      Expect.isTrue(f12 is F12);
 | 
|      Expect.isTrue(confuse(f12) is F12);
 | 
|      // In checked mode, verifies the type.
 | 
| -    core.List<core.int> Function(
 | 
| -        [List<Function> x1]) Function<B extends core.int>() l12;
 | 
| +    core.List<core.int> Function([List<Function> x1])
 | 
| +        Function<B extends core.int>() l12;
 | 
|      // The static function f12 sets `T` to `int`.
 | 
|      if (!tIsBool) {
 | 
|        x12 = f12 as dynamic;
 | 
| @@ -597,8 +576,8 @@ class U46<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m12 is F12);
 | 
| -    Expect.isTrue(m12 is core.List<core.int> Function(
 | 
| -        [List<Function> x1]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m12 is core.List<core.int> Function([List<Function> x1])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m12) is F12);
 | 
|      // In checked mode, verifies the type.
 | 
|      x12 = m12;
 | 
| @@ -623,8 +602,8 @@ class U46<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m13 is F13);
 | 
| -    Expect.isTrue(m13 is core.List<core.int> Function(
 | 
| -        {List<T> x}) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m13 is core.List<core.int> Function({List<T> x})
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m13) is F13);
 | 
|      // In checked mode, verifies the type.
 | 
|      x13 = m13;
 | 
| @@ -639,7 +618,7 @@ class U46<T> {
 | 
|        Expect.equals(tIsDynamic, m13 is F13<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m13) is F13<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x13 = (f13 as dynamic);
 | 
|          });
 | 
| @@ -678,8 +657,8 @@ class U46<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m14 is F14);
 | 
| -    Expect.isTrue(m14 is List<T> Function(int y,
 | 
| -        {Function x}) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m14 is List<T> Function(int y, {Function x})
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m14) is F14);
 | 
|      // In checked mode, verifies the type.
 | 
|      x14 = m14;
 | 
| @@ -694,7 +673,7 @@ class U46<T> {
 | 
|        Expect.equals(tIsDynamic, m14 is F14<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m14) is F14<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x14 = (f14 as dynamic);
 | 
|          });
 | 
| @@ -733,8 +712,8 @@ class U46<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m15 is F15);
 | 
| -    Expect.isTrue(m15 is List<T> Function(int x1,
 | 
| -        [List<T> x]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m15 is List<T> Function(int x1, [List<T> x])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m15) is F15);
 | 
|      // In checked mode, verifies the type.
 | 
|      x15 = m15;
 | 
| @@ -749,7 +728,7 @@ class U46<T> {
 | 
|        Expect.equals(tIsDynamic, m15 is F15<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m15) is F15<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x15 = (f15 as dynamic);
 | 
|          });
 | 
| @@ -813,8 +792,8 @@ class U46<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m17 is F17);
 | 
| -    Expect.isTrue(m17 is Function(int x,
 | 
| -        [core.List<core.int> x1]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m17 is Function(int x, [core.List<core.int> x1])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m17) is F17);
 | 
|      // In checked mode, verifies the type.
 | 
|      x17 = m17;
 | 
| @@ -863,8 +842,8 @@ class U46<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m19 is F19);
 | 
| -    Expect.isTrue(m19 is void Function(
 | 
| -        [core.List<core.int> x]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m19 is void Function([core.List<core.int> x])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m19) is F19);
 | 
|      // In checked mode, verifies the type.
 | 
|      x19 = m19;
 | 
| @@ -888,8 +867,8 @@ class U46<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m20 is F20);
 | 
| -    Expect.isTrue(m20 is int Function<A>(
 | 
| -        core.List<core.int> x) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m20 is int Function<A>(core.List<core.int> x)
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m20) is F20);
 | 
|      // In checked mode, verifies the type.
 | 
|      x20 = m20;
 | 
| @@ -914,8 +893,8 @@ class U46<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m21 is F21);
 | 
| -    Expect.isTrue(m21 is core.List<core.int> Function<A>(
 | 
| -        List<T> x) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m21 is core.List<core.int> Function<A>(List<T> x)
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m21) is F21);
 | 
|      // In checked mode, verifies the type.
 | 
|      x21 = m21;
 | 
| @@ -930,15 +909,15 @@ class U46<T> {
 | 
|        Expect.equals(tIsDynamic, m21 is F21<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m21) is F21<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x21 = (f21 as dynamic);
 | 
|          });
 | 
|          Expect.throws(() {
 | 
|            x21 = confuse(f21);
 | 
|          });
 | 
| -        core.List<core.int> Function<A>(
 | 
| -            List<T> x) Function<B extends core.int>() l21;
 | 
| +        core.List<core.int> Function<A>(List<T> x)
 | 
| +            Function<B extends core.int>() l21;
 | 
|          Expect.throws(() {
 | 
|            l21 = (f21 as dynamic);
 | 
|          });
 | 
| @@ -1008,7 +987,7 @@ class U46<T> {
 | 
|        Expect.equals(tIsDynamic, m23 is F23<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m23) is F23<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x23 = (f23 as dynamic);
 | 
|          });
 | 
| 
 |