| Index: tests/language/function_type/function_type91_test.dart
 | 
| diff --git a/tests/language/function_type/function_type91_test.dart b/tests/language/function_type/function_type91_test.dart
 | 
| index b16cb1dddce34339992471e124855ecf63c5f9e5..dad983deba2df3016999f8120bf8f3a1a56114a4 100644
 | 
| --- a/tests/language/function_type/function_type91_test.dart
 | 
| +++ b/tests/language/function_type/function_type91_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>
 | 
| -    = Function Function(int x0, [core.List<core.int> x]);
 | 
| -typedef F1<T>
 | 
| -    = core.List<core.int> Function([List<Function> x]);
 | 
| -typedef F2<T>
 | 
| -    = Function(Function x);
 | 
| -typedef F3<T>
 | 
| -    = void Function();
 | 
| -typedef F4<T>
 | 
| -    = int Function(int x2, [int x3]) Function<B extends core.int>(int x);
 | 
| -typedef F5<T>
 | 
| -    = int Function(int x1, {List<Function> x}) Function<B extends core.int>(
 | 
| -        int x);
 | 
| -typedef F6<T>
 | 
| -    = Function Function(int x) Function<B extends core.int>(int x);
 | 
| -typedef F7<T>
 | 
| -    = Function Function(int y, [List<Function> x]) Function<B extends core.int>(
 | 
| -        int x);
 | 
| -typedef F8<T>
 | 
| -    = Function Function(int x2, [List<T> x3]) Function<B extends core.int>(
 | 
| -        int x);
 | 
| -typedef F9<T>
 | 
| -    = List<Function> Function({Function x}) Function<B extends core.int>(int x);
 | 
| -typedef F10<T>
 | 
| -    = List<Function> Function(List<T> x) Function<B extends core.int>(int x);
 | 
| -typedef F11<T>
 | 
| -    = core.List<core.int> Function(int x1,
 | 
| -        [Function x]) Function<B extends core.int>(int x);
 | 
| -typedef F12<T>
 | 
| -    = core.List<core.int> Function(
 | 
| -        [core.List<core.int> x1]) Function<B extends core.int>(int x);
 | 
| -typedef F13<T>
 | 
| -    = List<T> Function(int x, [int x1]) Function<B extends core.int>(int x);
 | 
| -typedef F14<T>
 | 
| -    = List<T> Function(int y, {List<Function> x}) Function<B extends core.int>(
 | 
| -        int x);
 | 
| -typedef F15<T>
 | 
| -    = Function([int x]) Function<B extends core.int>(int x);
 | 
| -typedef F16<T>
 | 
| -    = Function(List<Function> x1) Function<B extends core.int>(int x);
 | 
| -typedef F17<T>
 | 
| -    = Function(int x, [List<T> x1]) Function<B extends core.int>(int x);
 | 
| -typedef F18<T>
 | 
| -    = void Function(int x1, {Function x}) Function<B extends core.int>(int x);
 | 
| -typedef F19<T>
 | 
| -    = void Function([List<T> x]) Function<B extends core.int>(int x);
 | 
| -typedef F20<T>
 | 
| -    = Function Function<A>(A x) Function<B extends core.int>(int x);
 | 
| -typedef F21<T>
 | 
| -    = List<T> Function<A>(List<A> x) Function<B extends core.int>(int x);
 | 
| -typedef F22<T>
 | 
| -    = void Function<A>(int x) Function<B extends core.int>(int x);
 | 
| +typedef F0<T> = Function Function(int x0, [core.List<core.int> x]);
 | 
| +typedef F1<T> = core.List<core.int> Function([List<Function> x]);
 | 
| +typedef F2<T> = Function(Function x);
 | 
| +typedef F3<T> = void Function();
 | 
| +typedef F4<T> = int Function(int x2, [int x3]) Function<B extends core.int>(
 | 
| +    int x);
 | 
| +typedef F5<T> = int Function(int x1, {List<Function> x})
 | 
| +    Function<B extends core.int>(int x);
 | 
| +typedef F6<T> = Function Function(int x) Function<B extends core.int>(int x);
 | 
| +typedef F7<T> = Function Function(int y, [List<Function> x])
 | 
| +    Function<B extends core.int>(int x);
 | 
| +typedef F8<T> = Function Function(int x2, [List<T> x3])
 | 
| +    Function<B extends core.int>(int x);
 | 
| +typedef F9<T> = List<Function> Function({Function x})
 | 
| +    Function<B extends core.int>(int x);
 | 
| +typedef F10<T> = List<Function> Function(List<T> x)
 | 
| +    Function<B extends core.int>(int x);
 | 
| +typedef F11<T> = core.List<core.int> Function(int x1, [Function x])
 | 
| +    Function<B extends core.int>(int x);
 | 
| +typedef F12<T> = core.List<core.int> Function([core.List<core.int> x1])
 | 
| +    Function<B extends core.int>(int x);
 | 
| +typedef F13<T> = List<T> Function(int x, [int x1]) Function<B extends core.int>(
 | 
| +    int x);
 | 
| +typedef F14<T> = List<T> Function(int y, {List<Function> x})
 | 
| +    Function<B extends core.int>(int x);
 | 
| +typedef F15<T> = Function([int x]) Function<B extends core.int>(int x);
 | 
| +typedef F16<T> = Function(List<Function> x1) Function<B extends core.int>(
 | 
| +    int x);
 | 
| +typedef F17<T> = Function(int x, [List<T> x1]) Function<B extends core.int>(
 | 
| +    int x);
 | 
| +typedef F18<T> = void Function(int x1, {Function x})
 | 
| +    Function<B extends core.int>(int x);
 | 
| +typedef F19<T> = void Function([List<T> x]) Function<B extends core.int>(int x);
 | 
| +typedef F20<T> = Function Function<A>(A x) Function<B extends core.int>(int x);
 | 
| +typedef F21<T> = List<T> Function<A>(List<A> x) Function<B extends core.int>(
 | 
| +    int x);
 | 
| +typedef F22<T> = void Function<A>(int x) Function<B extends core.int>(int x);
 | 
|  
 | 
|  Function f0(int x0, [core.List<core.int> x]) => null;
 | 
|  core.List<core.int> f1([List<Function> x]) => null;
 | 
| @@ -127,10 +106,10 @@ class U91<T> {
 | 
|        x8;
 | 
|    List<Function> Function({Function x}) Function<B extends core.int>(int x) x9;
 | 
|    List<Function> Function(List<T> x) Function<B extends core.int>(int x) x10;
 | 
| -  core.List<core.int> Function(int x1,
 | 
| -      [Function x]) Function<B extends core.int>(int x) x11;
 | 
| -  core.List<core.int> Function(
 | 
| -      [core.List<core.int> x1]) Function<B extends core.int>(int x) x12;
 | 
| +  core.List<core.int> Function(int x1, [Function x])
 | 
| +      Function<B extends core.int>(int x) x11;
 | 
| +  core.List<core.int> Function([core.List<core.int> x1])
 | 
| +      Function<B extends core.int>(int x) x12;
 | 
|    List<T> Function(int x, [int x1]) Function<B extends core.int>(int x) x13;
 | 
|    List<T> Function(int y, {List<Function> x}) Function<B extends core.int>(
 | 
|        int x) x14;
 | 
| @@ -313,8 +292,8 @@ class U91<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m4 is F4);
 | 
| -    Expect.isTrue(m4 is int Function(int x2,
 | 
| -        [int x3]) Function<B extends core.int>(int x));
 | 
| +    Expect.isTrue(m4 is int Function(int x2, [int x3])
 | 
| +        Function<B extends core.int>(int x));
 | 
|      Expect.isTrue(confuse(m4) is F4);
 | 
|      // In checked mode, verifies the type.
 | 
|      x4 = m4;
 | 
| @@ -339,8 +318,8 @@ class U91<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m5 is F5);
 | 
| -    Expect.isTrue(m5 is int Function(int x1,
 | 
| -        {List<Function> x}) Function<B extends core.int>(int x));
 | 
| +    Expect.isTrue(m5 is int Function(int x1, {List<Function> x})
 | 
| +        Function<B extends core.int>(int x));
 | 
|      Expect.isTrue(confuse(m5) is F5);
 | 
|      // In checked mode, verifies the type.
 | 
|      x5 = m5;
 | 
| @@ -390,8 +369,8 @@ class U91<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m7 is F7);
 | 
| -    Expect.isTrue(m7 is Function Function(int y,
 | 
| -        [List<Function> x]) Function<B extends core.int>(int x));
 | 
| +    Expect.isTrue(m7 is Function Function(int y, [List<Function> x])
 | 
| +        Function<B extends core.int>(int x));
 | 
|      Expect.isTrue(confuse(m7) is F7);
 | 
|      // In checked mode, verifies the type.
 | 
|      x7 = m7;
 | 
| @@ -416,8 +395,8 @@ class U91<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m8 is F8);
 | 
| -    Expect.isTrue(m8 is Function Function(int x2,
 | 
| -        [List<T> x3]) Function<B extends core.int>(int x));
 | 
| +    Expect.isTrue(m8 is Function Function(int x2, [List<T> x3])
 | 
| +        Function<B extends core.int>(int x));
 | 
|      Expect.isTrue(confuse(m8) is F8);
 | 
|      // In checked mode, verifies the type.
 | 
|      x8 = m8;
 | 
| @@ -432,7 +411,7 @@ class U91<T> {
 | 
|        Expect.equals(tIsDynamic, m8 is F8<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m8) is F8<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x8 = (f8 as dynamic);
 | 
|          });
 | 
| @@ -472,8 +451,8 @@ class U91<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m9 is F9);
 | 
| -    Expect.isTrue(m9 is List<Function> Function(
 | 
| -        {Function x}) Function<B extends core.int>(int x));
 | 
| +    Expect.isTrue(m9 is List<Function> Function({Function x})
 | 
| +        Function<B extends core.int>(int x));
 | 
|      Expect.isTrue(confuse(m9) is F9);
 | 
|      // In checked mode, verifies the type.
 | 
|      x9 = m9;
 | 
| @@ -497,8 +476,8 @@ class U91<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m10 is F10);
 | 
| -    Expect.isTrue(m10 is List<Function> Function(
 | 
| -        List<T> x) Function<B extends core.int>(int x));
 | 
| +    Expect.isTrue(m10 is List<Function> Function(List<T> x)
 | 
| +        Function<B extends core.int>(int x));
 | 
|      Expect.isTrue(confuse(m10) is F10);
 | 
|      // In checked mode, verifies the type.
 | 
|      x10 = m10;
 | 
| @@ -513,7 +492,7 @@ class U91<T> {
 | 
|        Expect.equals(tIsDynamic, m10 is F10<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m10) is F10<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x10 = (f10 as dynamic);
 | 
|          });
 | 
| @@ -542,8 +521,8 @@ class U91<T> {
 | 
|      Expect.isTrue(f11 is F11);
 | 
|      Expect.isTrue(confuse(f11) is F11);
 | 
|      // In checked mode, verifies the type.
 | 
| -    core.List<core.int> Function(int x1,
 | 
| -        [Function x]) Function<B extends core.int>(int x) l11;
 | 
| +    core.List<core.int> Function(int x1, [Function x])
 | 
| +        Function<B extends core.int>(int x) l11;
 | 
|      // The static function f11 sets `T` to `int`.
 | 
|      if (!tIsBool) {
 | 
|        x11 = f11 as dynamic;
 | 
| @@ -553,8 +532,8 @@ class U91<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m11 is F11);
 | 
| -    Expect.isTrue(m11 is core.List<core.int> Function(int x1,
 | 
| -        [Function x]) Function<B extends core.int>(int x));
 | 
| +    Expect.isTrue(m11 is core.List<core.int> Function(int x1, [Function x])
 | 
| +        Function<B extends core.int>(int x));
 | 
|      Expect.isTrue(confuse(m11) is F11);
 | 
|      // In checked mode, verifies the type.
 | 
|      x11 = m11;
 | 
| @@ -568,8 +547,8 @@ class U91<T> {
 | 
|      Expect.isTrue(f12 is F12);
 | 
|      Expect.isTrue(confuse(f12) is F12);
 | 
|      // In checked mode, verifies the type.
 | 
| -    core.List<core.int> Function(
 | 
| -        [core.List<core.int> x1]) Function<B extends core.int>(int x) l12;
 | 
| +    core.List<core.int> Function([core.List<core.int> x1])
 | 
| +        Function<B extends core.int>(int x) l12;
 | 
|      // The static function f12 sets `T` to `int`.
 | 
|      if (!tIsBool) {
 | 
|        x12 = f12 as dynamic;
 | 
| @@ -579,8 +558,8 @@ class U91<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m12 is F12);
 | 
| -    Expect.isTrue(m12 is core.List<core.int> Function(
 | 
| -        [core.List<core.int> x1]) Function<B extends core.int>(int x));
 | 
| +    Expect.isTrue(m12 is core.List<core.int> Function([core.List<core.int> x1])
 | 
| +        Function<B extends core.int>(int x));
 | 
|      Expect.isTrue(confuse(m12) is F12);
 | 
|      // In checked mode, verifies the type.
 | 
|      x12 = m12;
 | 
| @@ -604,8 +583,8 @@ class U91<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m13 is F13);
 | 
| -    Expect.isTrue(m13 is List<T> Function(int x,
 | 
| -        [int x1]) Function<B extends core.int>(int x));
 | 
| +    Expect.isTrue(m13 is List<T> Function(int x, [int x1])
 | 
| +        Function<B extends core.int>(int x));
 | 
|      Expect.isTrue(confuse(m13) is F13);
 | 
|      // In checked mode, verifies the type.
 | 
|      x13 = m13;
 | 
| @@ -620,7 +599,7 @@ class U91<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);
 | 
|          });
 | 
| @@ -660,8 +639,8 @@ class U91<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m14 is F14);
 | 
| -    Expect.isTrue(m14 is List<T> Function(int y,
 | 
| -        {List<Function> x}) Function<B extends core.int>(int x));
 | 
| +    Expect.isTrue(m14 is List<T> Function(int y, {List<Function> x})
 | 
| +        Function<B extends core.int>(int x));
 | 
|      Expect.isTrue(confuse(m14) is F14);
 | 
|      // In checked mode, verifies the type.
 | 
|      x14 = m14;
 | 
| @@ -676,15 +655,15 @@ class U91<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);
 | 
|          });
 | 
|          Expect.throws(() {
 | 
|            x14 = confuse(f14);
 | 
|          });
 | 
| -        List<T> Function(int y,
 | 
| -            {List<Function> x}) Function<B extends core.int>(int x) l14;
 | 
| +        List<T> Function(int y, {List<Function> x})
 | 
| +            Function<B extends core.int>(int x) l14;
 | 
|          Expect.throws(() {
 | 
|            l14 = (f14 as dynamic);
 | 
|          });
 | 
| @@ -764,8 +743,8 @@ class U91<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m17 is F17);
 | 
| -    Expect.isTrue(m17 is Function(int x,
 | 
| -        [List<T> x1]) Function<B extends core.int>(int x));
 | 
| +    Expect.isTrue(m17 is Function(int x, [List<T> x1])
 | 
| +        Function<B extends core.int>(int x));
 | 
|      Expect.isTrue(confuse(m17) is F17);
 | 
|      // In checked mode, verifies the type.
 | 
|      x17 = m17;
 | 
| @@ -780,7 +759,7 @@ class U91<T> {
 | 
|        Expect.equals(tIsDynamic, m17 is F17<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m17) is F17<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x17 = (f17 as dynamic);
 | 
|          });
 | 
| @@ -818,8 +797,8 @@ class U91<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m18 is F18);
 | 
| -    Expect.isTrue(m18 is void Function(int x1,
 | 
| -        {Function x}) Function<B extends core.int>(int x));
 | 
| +    Expect.isTrue(m18 is void Function(int x1, {Function x})
 | 
| +        Function<B extends core.int>(int x));
 | 
|      Expect.isTrue(confuse(m18) is F18);
 | 
|      // In checked mode, verifies the type.
 | 
|      x18 = m18;
 | 
| @@ -859,7 +838,7 @@ class U91<T> {
 | 
|        Expect.equals(tIsDynamic, m19 is F19<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m19) is F19<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x19 = (f19 as dynamic);
 | 
|          });
 | 
| @@ -921,8 +900,8 @@ class U91<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m21 is F21);
 | 
| -    Expect.isTrue(m21 is List<T> Function<A>(
 | 
| -        List<A> x) Function<B extends core.int>(int x));
 | 
| +    Expect.isTrue(m21 is List<T> Function<A>(List<A> x)
 | 
| +        Function<B extends core.int>(int x));
 | 
|      Expect.isTrue(confuse(m21) is F21);
 | 
|      // In checked mode, verifies the type.
 | 
|      x21 = m21;
 | 
| @@ -937,7 +916,7 @@ class U91<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);
 | 
|          });
 | 
| 
 |