| Index: tests/language/function_type/function_type82_test.dart
 | 
| diff --git a/tests/language/function_type/function_type82_test.dart b/tests/language/function_type/function_type82_test.dart
 | 
| index 05dd30487c04ef4fdeb439d28f4724630f1ce23a..e0533bbbb7fa3daf430c3bdc447b342f500feae0 100644
 | 
| --- a/tests/language/function_type/function_type82_test.dart
 | 
| +++ b/tests/language/function_type/function_type82_test.dart
 | 
| @@ -19,62 +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(List<Function> x0);
 | 
| -typedef F1<T>
 | 
| -    = core.List<core.int> Function(int y, [Function x]);
 | 
| -typedef F2<T>
 | 
| -    = Function(int x0, [int x]);
 | 
| -typedef F3<T>
 | 
| -    = void Function(int x0, [List<T> x]);
 | 
| -typedef F4<T>
 | 
| -    = int Function(int x1) Function<B extends core.int>();
 | 
| -typedef F5<T>
 | 
| -    = int Function(int x, [List<Function> x1]) Function<B extends core.int>();
 | 
| -typedef F6<T>
 | 
| -    = int Function(int y, {List<T> x}) Function<B extends core.int>();
 | 
| -typedef F7<T>
 | 
| -    = Function Function([List<Function> x]) Function<B extends core.int>();
 | 
| -typedef F8<T>
 | 
| -    = Function Function(List<T> x1) Function<B extends core.int>();
 | 
| -typedef F9<T>
 | 
| -    = List<Function> Function(int x2,
 | 
| -        [Function x3]) Function<B extends core.int>();
 | 
| -typedef F10<T>
 | 
| -    = List<Function> Function(int x1,
 | 
| -        {core.List<core.int> x}) Function<B extends core.int>();
 | 
| -typedef F11<T>
 | 
| -    = core.List<core.int> Function(Function x) Function<B extends core.int>();
 | 
| -typedef F12<T>
 | 
| -    = core.List<core.int> Function(int y,
 | 
| -        [core.List<core.int> x]) Function<B extends core.int>();
 | 
| -typedef F13<T>
 | 
| -    = List<T> Function([int x1]) Function<B extends core.int>();
 | 
| -typedef F14<T>
 | 
| -    = List<T> Function({List<Function> x}) Function<B extends core.int>();
 | 
| -typedef F15<T>
 | 
| -    = List<T> Function() Function<B extends core.int>();
 | 
| -typedef F16<T>
 | 
| -    = Function(int x1, [List<Function> x]) Function<B extends core.int>();
 | 
| -typedef F17<T>
 | 
| -    = Function([List<T> x1]) Function<B extends core.int>();
 | 
| -typedef F18<T>
 | 
| -    = void Function(int x, [Function x1]) Function<B extends core.int>();
 | 
| -typedef F19<T>
 | 
| -    = void Function(int y,
 | 
| -        {core.List<core.int> x}) Function<B extends core.int>();
 | 
| -typedef F20<T>
 | 
| -    = Function Function<A>(List<T> x) Function<B extends core.int>();
 | 
| -typedef F21<T>
 | 
| -    = List<T> Function<A>() Function<B extends core.int>();
 | 
| -typedef F22<T>
 | 
| -    = List<A> Function<A>(A x) Function<B extends core.int>();
 | 
| +typedef F0<T> = Function Function(List<Function> x0);
 | 
| +typedef F1<T> = core.List<core.int> Function(int y, [Function x]);
 | 
| +typedef F2<T> = Function(int x0, [int x]);
 | 
| +typedef F3<T> = void Function(int x0, [List<T> x]);
 | 
| +typedef F4<T> = int Function(int x1) Function<B extends core.int>();
 | 
| +typedef F5<T> = int Function(int x, [List<Function> x1])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F6<T> = int Function(int y, {List<T> x}) Function<B extends core.int>();
 | 
| +typedef F7<T> = Function Function([List<Function> x])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F8<T> = Function Function(List<T> x1) Function<B extends core.int>();
 | 
| +typedef F9<T> = List<Function> Function(int x2, [Function x3])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F10<T> = List<Function> Function(int x1, {core.List<core.int> x})
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F11<T> = core.List<core.int> Function(Function x)
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F12<T> = core.List<core.int> Function(int y, [core.List<core.int> x])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F13<T> = List<T> Function([int x1]) Function<B extends core.int>();
 | 
| +typedef F14<T> = List<T> Function({List<Function> x})
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F15<T> = List<T> Function() Function<B extends core.int>();
 | 
| +typedef F16<T> = Function(int x1, [List<Function> x])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F17<T> = Function([List<T> x1]) Function<B extends core.int>();
 | 
| +typedef F18<T> = void Function(int x, [Function x1])
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F19<T> = void Function(int y, {core.List<core.int> x})
 | 
| +    Function<B extends core.int>();
 | 
| +typedef F20<T> = Function Function<A>(List<T> x) Function<B extends core.int>();
 | 
| +typedef F21<T> = List<T> Function<A>() Function<B extends core.int>();
 | 
| +typedef F22<T> = List<A> Function<A>(A x) Function<B extends core.int>();
 | 
|  
 | 
|  Function f0(List<Function> x0) => null;
 | 
|  core.List<core.int> f1(int y, [Function x]) => null;
 | 
| @@ -118,11 +95,11 @@ class U82<T> {
 | 
|    Function Function(List<T> x1) Function<B extends core.int>() x8;
 | 
|    List<Function> Function(int x2, [Function x3]) Function<B extends core.int>()
 | 
|        x9;
 | 
| -  List<Function> Function(int x1,
 | 
| -      {core.List<core.int> x}) Function<B extends core.int>() x10;
 | 
| +  List<Function> Function(int x1, {core.List<core.int> x})
 | 
| +      Function<B extends core.int>() x10;
 | 
|    core.List<core.int> Function(Function x) Function<B extends core.int>() x11;
 | 
| -  core.List<core.int> Function(int y,
 | 
| -      [core.List<core.int> x]) Function<B extends core.int>() x12;
 | 
| +  core.List<core.int> Function(int y, [core.List<core.int> x])
 | 
| +      Function<B extends core.int>() x12;
 | 
|    List<T> Function([int x1]) Function<B extends core.int>() x13;
 | 
|    List<T> Function({List<Function> x}) Function<B extends core.int>() x14;
 | 
|    List<T> Function() Function<B extends core.int>() x15;
 | 
| @@ -294,7 +271,7 @@ class U82<T> {
 | 
|        Expect.equals(tIsDynamic, m3 is F3<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m3) is F3<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x3 = (f3 as dynamic);
 | 
|          });
 | 
| @@ -355,8 +332,8 @@ class U82<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m5 is F5);
 | 
| -    Expect.isTrue(m5 is int Function(int x,
 | 
| -        [List<Function> x1]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m5 is int Function(int x, [List<Function> x1])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m5) is F5);
 | 
|      // In checked mode, verifies the type.
 | 
|      x5 = m5;
 | 
| @@ -396,7 +373,7 @@ class U82<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);
 | 
|          });
 | 
| @@ -433,8 +410,8 @@ class U82<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m7 is F7);
 | 
| -    Expect.isTrue(m7 is Function Function(
 | 
| -        [List<Function> x]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m7 is Function Function([List<Function> x])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m7) is F7);
 | 
|      // In checked mode, verifies the type.
 | 
|      x7 = m7;
 | 
| @@ -474,7 +451,7 @@ class U82<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);
 | 
|          });
 | 
| @@ -501,8 +478,8 @@ class U82<T> {
 | 
|      Expect.isTrue(f9 is F9);
 | 
|      Expect.isTrue(confuse(f9) is F9);
 | 
|      // In checked mode, verifies the type.
 | 
| -    List<Function> Function(int x2,
 | 
| -        [Function x3]) Function<B extends core.int>() l9;
 | 
| +    List<Function> Function(int x2, [Function x3])
 | 
| +        Function<B extends core.int>() l9;
 | 
|      // The static function f9 sets `T` to `int`.
 | 
|      if (!tIsBool) {
 | 
|        x9 = f9 as dynamic;
 | 
| @@ -512,8 +489,8 @@ class U82<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m9 is F9);
 | 
| -    Expect.isTrue(m9 is List<Function> Function(int x2,
 | 
| -        [Function x3]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m9 is List<Function> Function(int x2, [Function x3])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m9) is F9);
 | 
|      // In checked mode, verifies the type.
 | 
|      x9 = m9;
 | 
| @@ -527,8 +504,8 @@ class U82<T> {
 | 
|      Expect.isTrue(f10 is F10);
 | 
|      Expect.isTrue(confuse(f10) is F10);
 | 
|      // In checked mode, verifies the type.
 | 
| -    List<Function> Function(int x1,
 | 
| -        {core.List<core.int> x}) Function<B extends core.int>() l10;
 | 
| +    List<Function> Function(int x1, {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;
 | 
| @@ -539,7 +516,8 @@ class U82<T> {
 | 
|  
 | 
|      Expect.isTrue(m10 is F10);
 | 
|      Expect.isTrue(m10 is List<Function> Function(int x1,
 | 
| -        {core.List<core.int> x}) Function<B extends core.int>());
 | 
| +            {core.List<core.int> x})
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m10) is F10);
 | 
|      // In checked mode, verifies the type.
 | 
|      x10 = m10;
 | 
| @@ -563,8 +541,8 @@ class U82<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m11 is F11);
 | 
| -    Expect.isTrue(m11 is core.List<core.int> Function(
 | 
| -        Function x) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m11 is core.List<core.int> Function(Function x)
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m11) is F11);
 | 
|      // In checked mode, verifies the type.
 | 
|      x11 = m11;
 | 
| @@ -578,8 +556,8 @@ class U82<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,
 | 
| -        [core.List<core.int> x]) Function<B extends core.int>() l12;
 | 
| +    core.List<core.int> Function(int y, [core.List<core.int> x])
 | 
| +        Function<B extends core.int>() l12;
 | 
|      // The static function f12 sets `T` to `int`.
 | 
|      if (!tIsBool) {
 | 
|        x12 = f12 as dynamic;
 | 
| @@ -590,7 +568,8 @@ class U82<T> {
 | 
|  
 | 
|      Expect.isTrue(m12 is F12);
 | 
|      Expect.isTrue(m12 is core.List<core.int> Function(int y,
 | 
| -        [core.List<core.int> x]) Function<B extends core.int>());
 | 
| +            [core.List<core.int> x])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m12) is F12);
 | 
|      // In checked mode, verifies the type.
 | 
|      x12 = m12;
 | 
| @@ -630,7 +609,7 @@ class U82<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);
 | 
|          });
 | 
| @@ -667,8 +646,8 @@ class U82<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m14 is F14);
 | 
| -    Expect.isTrue(m14 is List<T> Function(
 | 
| -        {List<Function> x}) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m14 is List<T> Function({List<Function> x})
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m14) is F14);
 | 
|      // In checked mode, verifies the type.
 | 
|      x14 = m14;
 | 
| @@ -683,7 +662,7 @@ class U82<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);
 | 
|          });
 | 
| @@ -736,7 +715,7 @@ class U82<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);
 | 
|          });
 | 
| @@ -773,8 +752,8 @@ class U82<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m16 is F16);
 | 
| -    Expect.isTrue(m16 is Function(int x1,
 | 
| -        [List<Function> x]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m16 is Function(int x1, [List<Function> x])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m16) is F16);
 | 
|      // In checked mode, verifies the type.
 | 
|      x16 = m16;
 | 
| @@ -813,7 +792,7 @@ class U82<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);
 | 
|          });
 | 
| @@ -850,8 +829,8 @@ class U82<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m18 is F18);
 | 
| -    Expect.isTrue(m18 is void Function(int x,
 | 
| -        [Function x1]) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m18 is void Function(int x, [Function x1])
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m18) is F18);
 | 
|      // In checked mode, verifies the type.
 | 
|      x18 = m18;
 | 
| @@ -876,8 +855,8 @@ class U82<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m19 is F19);
 | 
| -    Expect.isTrue(m19 is void Function(int y,
 | 
| -        {core.List<core.int> x}) Function<B extends core.int>());
 | 
| +    Expect.isTrue(m19 is void Function(int y, {core.List<core.int> x})
 | 
| +        Function<B extends core.int>());
 | 
|      Expect.isTrue(confuse(m19) is F19);
 | 
|      // In checked mode, verifies the type.
 | 
|      x19 = m19;
 | 
| @@ -917,7 +896,7 @@ class U82<T> {
 | 
|        Expect.equals(tIsDynamic, m20 is F20<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m20) is F20<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x20 = (f20 as dynamic);
 | 
|          });
 | 
| @@ -969,7 +948,7 @@ class U82<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);
 | 
|          });
 | 
| 
 |