| Index: tests/language/function_type/function_type94_test.dart
 | 
| diff --git a/tests/language/function_type/function_type94_test.dart b/tests/language/function_type/function_type94_test.dart
 | 
| index 8adb88b8d7b1f1b80a2ade6fbf5985f1370dfb7d..586e60c06e655a663b417ee950440c8fb9b8fb7d 100644
 | 
| --- a/tests/language/function_type/function_type94_test.dart
 | 
| +++ b/tests/language/function_type/function_type94_test.dart
 | 
| @@ -19,61 +19,39 @@ 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([core.List<core.int> x1]);
 | 
| -typedef F1<T>
 | 
| -    = core.List<core.int> Function(List<Function> x0);
 | 
| -typedef F2<T>
 | 
| -    = Function(int y, [Function x]);
 | 
| -typedef F3<T>
 | 
| -    = int Function<A>(List<Function> x);
 | 
| -typedef F4<T>
 | 
| -    = int Function(int x, [int x1]) Function<B extends core.int>();
 | 
| -typedef F5<T>
 | 
| -    = int Function(int y, {List<Function> x}) Function<B extends core.int>();
 | 
| -typedef F6<T>
 | 
| -    = Function Function([int x]) Function<B extends core.int>();
 | 
| -typedef F7<T>
 | 
| -    = Function Function(List<Function> x1) Function<B extends core.int>();
 | 
| -typedef F8<T>
 | 
| -    = Function Function(int x, [List<T> x1]) Function<B extends core.int>();
 | 
| -typedef F9<T>
 | 
| -    = List<Function> Function(int x1,
 | 
| -        {Function x}) Function<B extends core.int>();
 | 
| -typedef F10<T>
 | 
| -    = List<Function> Function([List<T> x]) Function<B extends core.int>();
 | 
| -typedef F11<T>
 | 
| -    = core.List<core.int> Function(int y,
 | 
| -        [Function x]) Function<B extends core.int>();
 | 
| -typedef F12<T>
 | 
| -    = core.List<core.int> Function(int x2,
 | 
| -        [core.List<core.int> x3]) Function<B extends core.int>();
 | 
| -typedef F13<T>
 | 
| -    = List<T> Function({int x}) Function<B extends core.int>();
 | 
| -typedef F14<T>
 | 
| -    = List<T> Function(core.List<core.int> x) Function<B extends core.int>();
 | 
| -typedef F15<T>
 | 
| -    = Function(int x1, [int x]) Function<B extends core.int>();
 | 
| -typedef F16<T>
 | 
| -    = Function([List<Function> x1]) Function<B extends core.int>();
 | 
| -typedef F17<T>
 | 
| -    = Function({List<T> x}) Function<B extends core.int>();
 | 
| -typedef F18<T>
 | 
| -    = void Function(int y, {Function x}) Function<B extends core.int>();
 | 
| -typedef F19<T>
 | 
| -    = void Function(int x1, [List<T> x]) Function<B extends core.int>();
 | 
| -typedef F20<T>
 | 
| -    = Function Function<A>(List<A> x) Function<B extends core.int>();
 | 
| -typedef F21<T>
 | 
| -    = Function<A>(int x) Function<B extends core.int>();
 | 
| -typedef F22<T>
 | 
| -    = void Function<A>(Function x) Function<B extends core.int>();
 | 
| +typedef F0<T> = Function Function([core.List<core.int> x1]);
 | 
| +typedef F1<T> = core.List<core.int> Function(List<Function> x0);
 | 
| +typedef F2<T> = Function(int y, [Function x]);
 | 
| +typedef F3<T> = int Function<A>(List<Function> x);
 | 
| +typedef F4<T> = int Function(int x, [int x1]) Function<B extends core.int>();
 | 
| +typedef F5<T> = int Function(int y, {List<Function> x})
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F6<T> = Function Function([int x]) Function<B extends core.int>();
 | 
| +typedef F7<T> = Function Function(List<Function> x1)
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F8<T> = Function Function(int x, [List<T> x1])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F9<T> = List<Function> Function(int x1, {Function x})
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F10<T> = List<Function> Function([List<T> x])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F11<T> = core.List<core.int> Function(int y, [Function x])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F12<T> = core.List<core.int> Function(int x2, [core.List<core.int> x3])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F13<T> = List<T> Function({int x}) Function<B extends core.int>();
 | 
| +typedef F14<T> = List<T> Function(core.List<core.int> x)
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F15<T> = Function(int x1, [int x]) Function<B extends core.int>();
 | 
| +typedef F16<T> = Function([List<Function> x1]) Function<B extends core.int>();
 | 
| +typedef F17<T> = Function({List<T> x}) Function<B extends core.int>();
 | 
| +typedef F18<T> = void Function(int y, {Function x})
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F19<T> = void Function(int x1, [List<T> x])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F20<T> = Function Function<A>(List<A> x) Function<B extends core.int>();
 | 
| +typedef F21<T> = Function<A>(int x) Function<B extends core.int>();
 | 
| +typedef F22<T> = void Function<A>(Function x) Function<B extends core.int>();
 | 
|  
 | 
|  Function f0([core.List<core.int> x0]) => null;
 | 
|  core.List<core.int> f1(List<Function> x0) => null;
 | 
| @@ -118,10 +96,10 @@ class U94<T> {
 | 
|    List<Function> Function(int x1, {Function x}) Function<B extends core.int>()
 | 
|        x9;
 | 
|    List<Function> Function([List<T> x]) Function<B extends core.int>() x10;
 | 
| -  core.List<core.int> Function(int y,
 | 
| -      [Function x]) Function<B extends core.int>() x11;
 | 
| -  core.List<core.int> Function(int x2,
 | 
| -      [core.List<core.int> x3]) Function<B extends core.int>() x12;
 | 
| +  core.List<core.int> Function(int y, [Function x])
 | 
| +      Function<B extends core.int>() x11;
 | 
| +  core.List<core.int> Function(int x2, [core.List<core.int> x3])
 | 
| +      Function<B extends core.int>() x12;
 | 
|    List<T> Function({int x}) Function<B extends core.int>() x13;
 | 
|    List<T> Function(core.List<core.int> x) Function<B extends core.int>() x14;
 | 
|    Function(int x1, [int x]) Function<B extends core.int>() x15;
 | 
| @@ -325,8 +303,8 @@ class U94<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m5 is F5);
 | 
| -    Expect.isTrue(m5 is int Function(int y,
 | 
| -        {List<Function> x}) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m5 is int Function(int y, {List<Function> x})
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m5) is F5);
 | 
|      // In checked mode, verifies the type.
 | 
|      x5 = m5;
 | 
| @@ -375,8 +353,8 @@ class U94<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m7 is F7);
 | 
| -    Expect.isTrue(m7 is Function Function(
 | 
| -        List<Function> x1) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m7 is Function Function(List<Function> x1)
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m7) is F7);
 | 
|      // In checked mode, verifies the type.
 | 
|      x7 = m7;
 | 
| @@ -400,8 +378,8 @@ class U94<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m8 is F8);
 | 
| -    Expect.isTrue(m8 is Function Function(int x,
 | 
| -        [List<T> x1]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m8 is Function Function(int x, [List<T> x1])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m8) is F8);
 | 
|      // In checked mode, verifies the type.
 | 
|      x8 = m8;
 | 
| @@ -416,7 +394,7 @@ class U94<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);
 | 
|          });
 | 
| @@ -456,8 +434,8 @@ class U94<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m9 is F9);
 | 
| -    Expect.isTrue(m9 is List<Function> Function(int x1,
 | 
| -        {Function x}) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m9 is List<Function> Function(int x1, {Function x})
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m9) is F9);
 | 
|      // In checked mode, verifies the type.
 | 
|      x9 = m9;
 | 
| @@ -481,8 +459,8 @@ class U94<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m10 is F10);
 | 
| -    Expect.isTrue(m10 is List<Function> Function(
 | 
| -        [List<T> x]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m10 is List<Function> Function([List<T> x])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m10) is F10);
 | 
|      // In checked mode, verifies the type.
 | 
|      x10 = m10;
 | 
| @@ -497,7 +475,7 @@ class U94<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);
 | 
|          });
 | 
| @@ -525,8 +503,8 @@ class U94<T> {
 | 
|      Expect.isTrue(f11 is F11);
 | 
|      Expect.isTrue(confuse(f11) is F11);
 | 
|      // In checked mode, verifies the type.
 | 
| -    core.List<core.int> Function(int y,
 | 
| -        [Function x]) Function<B extends core.int>() l11;
 | 
| +    core.List<core.int> Function(int y, [Function x])
 | 
| +        Function<B extends core.int>() l11;
 | 
|      // The static function f11 sets `T` to `int`.
 | 
|      if (!tIsBool) {
 | 
|        x11 = f11 as dynamic;
 | 
| @@ -536,8 +514,8 @@ class U94<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m11 is F11);
 | 
| -    Expect.isTrue(m11 is core.List<core.int> Function(int y,
 | 
| -        [Function x]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m11 is core.List<core.int> Function(int y, [Function x])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m11) is F11);
 | 
|      // In checked mode, verifies the type.
 | 
|      x11 = m11;
 | 
| @@ -551,8 +529,8 @@ class U94<T> {
 | 
|      Expect.isTrue(f12 is F12);
 | 
|      Expect.isTrue(confuse(f12) is F12);
 | 
|      // In checked mode, verifies the type.
 | 
| -    core.List<core.int> Function(int x2,
 | 
| -        [core.List<core.int> x3]) Function<B extends core.int>() l12;
 | 
| +    core.List<core.int> Function(int x2, [core.List<core.int> x3])
 | 
| +        Function<B extends core.int>() l12;
 | 
|      // The static function f12 sets `T` to `int`.
 | 
|      if (!tIsBool) {
 | 
|        x12 = f12 as dynamic;
 | 
| @@ -563,7 +541,8 @@ class U94<T> {
 | 
|  
 | 
|      Expect.isTrue(m12 is F12);
 | 
|      Expect.isTrue(m12 is core.List<core.int> Function(int x2,
 | 
| -        [core.List<core.int> x3]) Function<B extends core.int>());
 | 
| +            [core.List<core.int> x3])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m12) is F12);
 | 
|      // In checked mode, verifies the type.
 | 
|      x12 = m12;
 | 
| @@ -603,7 +582,7 @@ class U94<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);
 | 
|          });
 | 
| @@ -640,8 +619,8 @@ class U94<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m14 is F14);
 | 
| -    Expect.isTrue(m14 is List<T> Function(
 | 
| -        core.List<core.int> x) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m14 is List<T> Function(core.List<core.int> x)
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m14) is F14);
 | 
|      // In checked mode, verifies the type.
 | 
|      x14 = m14;
 | 
| @@ -656,7 +635,7 @@ class U94<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);
 | 
|          });
 | 
| @@ -760,7 +739,7 @@ class U94<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);
 | 
|          });
 | 
| @@ -797,8 +776,8 @@ class U94<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m18 is F18);
 | 
| -    Expect.isTrue(m18 is void Function(int y,
 | 
| -        {Function x}) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m18 is void Function(int y, {Function x})
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m18) is F18);
 | 
|      // In checked mode, verifies the type.
 | 
|      x18 = m18;
 | 
| @@ -822,8 +801,8 @@ class U94<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m19 is F19);
 | 
| -    Expect.isTrue(m19 is void Function(int x1,
 | 
| -        [List<T> x]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m19 is void Function(int x1, [List<T> x])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m19) is F19);
 | 
|      // In checked mode, verifies the type.
 | 
|      x19 = m19;
 | 
| @@ -838,7 +817,7 @@ class U94<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);
 | 
|          });
 | 
| 
 |