| Index: tests/language/function_type/function_type38_test.dart
 | 
| diff --git a/tests/language/function_type/function_type38_test.dart b/tests/language/function_type/function_type38_test.dart
 | 
| index 83e7a4de57225cc408d03886ae91ca053e114fc6..3a5a4493422f6e0eb8c85329fb896dacb4f2b785 100644
 | 
| --- a/tests/language/function_type/function_type38_test.dart
 | 
| +++ b/tests/language/function_type/function_type38_test.dart
 | 
| @@ -19,65 +19,42 @@ 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([core.List<core.int> x1]);
 | 
| -typedef F1<T>
 | 
| -    = List<Function> Function(List<Function> x0);
 | 
| -typedef F2<T>
 | 
| -    = List<T> Function(int y, [Function x]);
 | 
| -typedef F3<T>
 | 
| -    = void Function(int x0, [int x]);
 | 
| -typedef F4<T>
 | 
| -    = Function<A>(A x);
 | 
| -typedef F5<T>
 | 
| -    = int Function(int x, [Function x1]) Function<B extends core.int>();
 | 
| -typedef F6<T>
 | 
| -    = int Function(int y,
 | 
| -        {core.List<core.int> x}) Function<B extends core.int>();
 | 
| -typedef F7<T>
 | 
| -    = Function Function([Function x]) Function<B extends core.int>();
 | 
| -typedef F8<T>
 | 
| -    = Function Function(core.List<core.int> x1) Function<B extends core.int>();
 | 
| -typedef F9<T>
 | 
| -    = List<Function> Function(int x2, [int x3]) Function<B extends core.int>();
 | 
| -typedef F10<T>
 | 
| -    = List<Function> Function(int x1,
 | 
| -        {List<Function> x}) Function<B extends core.int>();
 | 
| -typedef F11<T>
 | 
| -    = core.List<core.int> Function(int x) Function<B extends core.int>();
 | 
| -typedef F12<T>
 | 
| -    = core.List<core.int> Function(int y,
 | 
| -        [List<Function> x]) Function<B extends core.int>();
 | 
| -typedef F13<T>
 | 
| -    = core.List<core.int> Function(int x2,
 | 
| -        [List<T> x3]) Function<B extends core.int>();
 | 
| -typedef F14<T>
 | 
| -    = List<T> Function({Function x}) Function<B extends core.int>();
 | 
| -typedef F15<T>
 | 
| -    = List<T> Function(List<T> x) Function<B extends core.int>();
 | 
| -typedef F16<T>
 | 
| -    = Function(int x1, [Function x]) Function<B extends core.int>();
 | 
| -typedef F17<T>
 | 
| -    = Function([core.List<core.int> x1]) Function<B extends core.int>();
 | 
| -typedef F18<T>
 | 
| -    = void Function(int x, [int x1]) Function<B extends core.int>();
 | 
| -typedef F19<T>
 | 
| -    = void Function(int y, {List<Function> x}) Function<B extends core.int>();
 | 
| -typedef F20<T>
 | 
| -    = int Function<A>(Function x) Function<B extends core.int>();
 | 
| -typedef F21<T>
 | 
| -    = core.List<core.int> Function<A>(
 | 
| -        List<Function> x) Function<B extends core.int>();
 | 
| -typedef F22<T>
 | 
| -    = A Function<A>(core.List<core.int> x) Function<B extends core.int>();
 | 
| -typedef F23<T>
 | 
| -    = B Function(int x) Function<B extends core.int>();
 | 
| +typedef F0<T> = int Function([core.List<core.int> x1]);
 | 
| +typedef F1<T> = List<Function> Function(List<Function> x0);
 | 
| +typedef F2<T> = List<T> Function(int y, [Function x]);
 | 
| +typedef F3<T> = void Function(int x0, [int x]);
 | 
| +typedef F4<T> = Function<A>(A x);
 | 
| +typedef F5<T> = int Function(int x, [Function x1])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F6<T> = int Function(int y, {core.List<core.int> x})
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F7<T> = Function Function([Function x]) Function<B extends core.int>();
 | 
| +typedef F8<T> = Function Function(core.List<core.int> x1)
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F9<T> = List<Function> Function(int x2, [int x3])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F10<T> = List<Function> Function(int x1, {List<Function> x})
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F11<T> = core.List<core.int> Function(int x)
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F12<T> = core.List<core.int> Function(int y, [List<Function> x])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F13<T> = core.List<core.int> Function(int x2, [List<T> x3])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F14<T> = List<T> Function({Function x}) Function<B extends core.int>();
 | 
| +typedef F15<T> = List<T> Function(List<T> x) Function<B extends core.int>();
 | 
| +typedef F16<T> = Function(int x1, [Function x]) Function<B extends core.int>();
 | 
| +typedef F17<T> = Function([core.List<core.int> x1])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F18<T> = void Function(int x, [int x1]) Function<B extends core.int>();
 | 
| +typedef F19<T> = void Function(int y, {List<Function> x})
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F20<T> = int Function<A>(Function x) Function<B extends core.int>();
 | 
| +typedef F21<T> = core.List<core.int> Function<A>(List<Function> x)
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F22<T> = A Function<A>(core.List<core.int> x)
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F23<T> = B Function(int x) Function<B extends core.int>();
 | 
|  
 | 
|  int f0([core.List<core.int> x0]) => null;
 | 
|  List<Function> f1(List<Function> x0) => null;
 | 
| @@ -124,13 +101,13 @@ class U38<T> {
 | 
|    Function Function([Function x]) Function<B extends core.int>() x7;
 | 
|    Function Function(core.List<core.int> x1) Function<B extends core.int>() x8;
 | 
|    List<Function> Function(int x2, [int x3]) Function<B extends core.int>() x9;
 | 
| -  List<Function> Function(int x1,
 | 
| -      {List<Function> x}) Function<B extends core.int>() x10;
 | 
| +  List<Function> Function(int x1, {List<Function> x})
 | 
| +      Function<B extends core.int>() x10;
 | 
|    core.List<core.int> Function(int x) Function<B extends core.int>() x11;
 | 
| -  core.List<core.int> Function(int y,
 | 
| -      [List<Function> x]) Function<B extends core.int>() x12;
 | 
| -  core.List<core.int> Function(int x2,
 | 
| -      [List<T> x3]) Function<B extends core.int>() x13;
 | 
| +  core.List<core.int> Function(int y, [List<Function> x])
 | 
| +      Function<B extends core.int>() x12;
 | 
| +  core.List<core.int> Function(int x2, [List<T> x3])
 | 
| +      Function<B extends core.int>() x13;
 | 
|    List<T> Function({Function x}) Function<B extends core.int>() x14;
 | 
|    List<T> Function(List<T> x) Function<B extends core.int>() x15;
 | 
|    Function(int x1, [Function x]) Function<B extends core.int>() x16;
 | 
| @@ -138,8 +115,8 @@ class U38<T> {
 | 
|    void Function(int x, [int x1]) Function<B extends core.int>() x18;
 | 
|    void Function(int y, {List<Function> x}) Function<B extends core.int>() x19;
 | 
|    int Function<A>(Function x) Function<B extends core.int>() x20;
 | 
| -  core.List<core.int> Function<A>(
 | 
| -      List<Function> x) Function<B extends core.int>() x21;
 | 
| +  core.List<core.int> Function<A>(List<Function> x)
 | 
| +      Function<B extends core.int>() x21;
 | 
|    A Function<A>(core.List<core.int> x) Function<B extends core.int>() x22;
 | 
|    B Function(int x) Function<B extends core.int>() x23;
 | 
|  
 | 
| @@ -280,7 +257,7 @@ class U38<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);
 | 
|          });
 | 
| @@ -365,8 +342,8 @@ class U38<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m5 is F5);
 | 
| -    Expect.isTrue(m5 is int Function(int x,
 | 
| -        [Function x1]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m5 is int Function(int x, [Function x1])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m5) is F5);
 | 
|      // In checked mode, verifies the type.
 | 
|      x5 = m5;
 | 
| @@ -391,8 +368,8 @@ class U38<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m6 is F6);
 | 
| -    Expect.isTrue(m6 is int Function(int y,
 | 
| -        {core.List<core.int> x}) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m6 is int Function(int y, {core.List<core.int> x})
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m6) is F6);
 | 
|      // In checked mode, verifies the type.
 | 
|      x6 = m6;
 | 
| @@ -441,8 +418,8 @@ class U38<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m8 is F8);
 | 
| -    Expect.isTrue(m8 is Function Function(
 | 
| -        core.List<core.int> x1) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m8 is Function Function(core.List<core.int> x1)
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m8) is F8);
 | 
|      // In checked mode, verifies the type.
 | 
|      x8 = m8;
 | 
| @@ -466,8 +443,8 @@ class U38<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m9 is F9);
 | 
| -    Expect.isTrue(m9 is List<Function> Function(int x2,
 | 
| -        [int x3]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m9 is List<Function> Function(int x2, [int x3])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m9) is F9);
 | 
|      // In checked mode, verifies the type.
 | 
|      x9 = m9;
 | 
| @@ -481,8 +458,8 @@ class U38<T> {
 | 
|      Expect.isTrue(f10 is F10);
 | 
|      Expect.isTrue(confuse(f10) is F10);
 | 
|      // In checked mode, verifies the type.
 | 
| -    List<Function> Function(int x1,
 | 
| -        {List<Function> x}) Function<B extends core.int>() l10;
 | 
| +    List<Function> Function(int x1, {List<Function> x})
 | 
| +        Function<B extends core.int>() l10;
 | 
|      // The static function f10 sets `T` to `int`.
 | 
|      if (!tIsBool) {
 | 
|        x10 = f10 as dynamic;
 | 
| @@ -492,8 +469,8 @@ class U38<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m10 is F10);
 | 
| -    Expect.isTrue(m10 is List<Function> Function(int x1,
 | 
| -        {List<Function> x}) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m10 is List<Function> Function(int x1, {List<Function> x})
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m10) is F10);
 | 
|      // In checked mode, verifies the type.
 | 
|      x10 = m10;
 | 
| @@ -517,8 +494,8 @@ class U38<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m11 is F11);
 | 
| -    Expect.isTrue(m11 is core.List<core.int> Function(
 | 
| -        int x) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m11 is core.List<core.int> Function(int x)
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m11) is F11);
 | 
|      // In checked mode, verifies the type.
 | 
|      x11 = m11;
 | 
| @@ -532,8 +509,8 @@ class U38<T> {
 | 
|      Expect.isTrue(f12 is F12);
 | 
|      Expect.isTrue(confuse(f12) is F12);
 | 
|      // In checked mode, verifies the type.
 | 
| -    core.List<core.int> Function(int y,
 | 
| -        [List<Function> x]) Function<B extends core.int>() l12;
 | 
| +    core.List<core.int> Function(int y, [List<Function> x])
 | 
| +        Function<B extends core.int>() l12;
 | 
|      // The static function f12 sets `T` to `int`.
 | 
|      if (!tIsBool) {
 | 
|        x12 = f12 as dynamic;
 | 
| @@ -543,8 +520,8 @@ class U38<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m12 is F12);
 | 
| -    Expect.isTrue(m12 is core.List<core.int> Function(int y,
 | 
| -        [List<Function> x]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m12 is core.List<core.int> Function(int y, [List<Function> x])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m12) is F12);
 | 
|      // In checked mode, verifies the type.
 | 
|      x12 = m12;
 | 
| @@ -558,8 +535,8 @@ class U38<T> {
 | 
|      Expect.isTrue(f13 is F13);
 | 
|      Expect.isTrue(confuse(f13) is F13);
 | 
|      // In checked mode, verifies the type.
 | 
| -    core.List<core.int> Function(int x2,
 | 
| -        [List<T> x3]) Function<B extends core.int>() l13;
 | 
| +    core.List<core.int> Function(int x2, [List<T> x3])
 | 
| +        Function<B extends core.int>() l13;
 | 
|      // The static function f13 sets `T` to `int`.
 | 
|      if (!tIsBool) {
 | 
|        x13 = f13 as dynamic;
 | 
| @@ -569,8 +546,8 @@ class U38<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m13 is F13);
 | 
| -    Expect.isTrue(m13 is core.List<core.int> Function(int x2,
 | 
| -        [List<T> x3]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m13 is core.List<core.int> Function(int x2, [List<T> x3])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m13) is F13);
 | 
|      // In checked mode, verifies the type.
 | 
|      x13 = m13;
 | 
| @@ -585,15 +562,15 @@ class U38<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);
 | 
|          });
 | 
|          Expect.throws(() {
 | 
|            x13 = confuse(f13);
 | 
|          });
 | 
| -        core.List<core.int> Function(int x2,
 | 
| -            [List<T> x3]) Function<B extends core.int>() l13;
 | 
| +        core.List<core.int> Function(int x2, [List<T> x3])
 | 
| +            Function<B extends core.int>() l13;
 | 
|          Expect.throws(() {
 | 
|            l13 = (f13 as dynamic);
 | 
|          });
 | 
| @@ -601,8 +578,8 @@ class U38<T> {
 | 
|            l13 = confuse(f13);
 | 
|          });
 | 
|        }
 | 
| -      core.List<core.int> Function(int x2,
 | 
| -          [List<T> x3]) Function<B extends core.int>() l13 = m13;
 | 
| +      core.List<core.int> Function(int x2, [List<T> x3])
 | 
| +          Function<B extends core.int>() l13 = m13;
 | 
|        // In checked mode, verifies the type.
 | 
|        x13 = m13;
 | 
|        x13 = confuse(m13);
 | 
| @@ -640,7 +617,7 @@ class U38<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);
 | 
|          });
 | 
| @@ -693,7 +670,7 @@ class U38<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);
 | 
|          });
 | 
| @@ -755,8 +732,8 @@ class U38<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m17 is F17);
 | 
| -    Expect.isTrue(m17 is Function(
 | 
| -        [core.List<core.int> x1]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m17 is Function([core.List<core.int> x1])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m17) is F17);
 | 
|      // In checked mode, verifies the type.
 | 
|      x17 = m17;
 | 
| @@ -805,8 +782,8 @@ class U38<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m19 is F19);
 | 
| -    Expect.isTrue(m19 is void Function(int y,
 | 
| -        {List<Function> x}) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m19 is void Function(int y, {List<Function> x})
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m19) is F19);
 | 
|      // In checked mode, verifies the type.
 | 
|      x19 = m19;
 | 
| @@ -845,8 +822,8 @@ class U38<T> {
 | 
|      Expect.isTrue(f21 is F21);
 | 
|      Expect.isTrue(confuse(f21) is F21);
 | 
|      // In checked mode, verifies the type.
 | 
| -    core.List<core.int> Function<A>(
 | 
| -        List<Function> x) Function<B extends core.int>() l21;
 | 
| +    core.List<core.int> Function<A>(List<Function> x)
 | 
| +        Function<B extends core.int>() l21;
 | 
|      // The static function f21 sets `T` to `int`.
 | 
|      if (!tIsBool) {
 | 
|        x21 = f21 as dynamic;
 | 
| @@ -856,8 +833,8 @@ class U38<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m21 is F21);
 | 
| -    Expect.isTrue(m21 is core.List<core.int> Function<A>(
 | 
| -        List<Function> x) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m21 is core.List<core.int> Function<A>(List<Function> x)
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m21) is F21);
 | 
|      // In checked mode, verifies the type.
 | 
|      x21 = m21;
 | 
| @@ -881,8 +858,8 @@ class U38<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m22 is F22);
 | 
| -    Expect.isTrue(m22 is A Function<A>(
 | 
| -        core.List<core.int> x) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m22 is A Function<A>(core.List<core.int> x)
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m22) is F22);
 | 
|      // In checked mode, verifies the type.
 | 
|      x22 = m22;
 | 
| 
 |