| Index: tests/language/function_type/function_type81_test.dart
 | 
| diff --git a/tests/language/function_type/function_type81_test.dart b/tests/language/function_type/function_type81_test.dart
 | 
| index 6be4cafdc7110c76812ab86499c746f009c48dce..8968e148d675942a3337d88b9a1106636dba4199 100644
 | 
| --- a/tests/language/function_type/function_type81_test.dart
 | 
| +++ b/tests/language/function_type/function_type81_test.dart
 | 
| @@ -19,59 +19,31 @@ 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 y, [List<Function> x]);
 | 
| -typedef F1<T>
 | 
| -    = core.List<core.int> Function(int x0, [Function x]);
 | 
| -typedef F2<T>
 | 
| -    = Function([int x]);
 | 
| -typedef F3<T>
 | 
| -    = void Function([List<T> x]);
 | 
| -typedef F4<T>
 | 
| -    = int Function(int x1) Function(int x);
 | 
| -typedef F5<T>
 | 
| -    = int Function(int x, [List<Function> x1]) Function(int x);
 | 
| -typedef F6<T>
 | 
| -    = int Function(int y, {List<T> x}) Function(int x);
 | 
| -typedef F7<T>
 | 
| -    = Function Function([List<Function> x]) Function(int x);
 | 
| -typedef F8<T>
 | 
| -    = Function Function(List<T> x1) Function(int x);
 | 
| -typedef F9<T>
 | 
| -    = List<Function> Function(int x2, [Function x3]) Function(int x);
 | 
| -typedef F10<T>
 | 
| -    = List<Function> Function(int x1, {core.List<core.int> x}) Function(int x);
 | 
| -typedef F11<T>
 | 
| -    = core.List<core.int> Function(Function x) Function(int x);
 | 
| -typedef F12<T>
 | 
| -    = core.List<core.int> Function(int y, [core.List<core.int> x]) Function(
 | 
| -        int x);
 | 
| -typedef F13<T>
 | 
| -    = List<T> Function([int x1]) Function(int x);
 | 
| -typedef F14<T>
 | 
| -    = List<T> Function({List<Function> x}) Function(int x);
 | 
| -typedef F15<T>
 | 
| -    = List<T> Function() Function(int x);
 | 
| -typedef F16<T>
 | 
| -    = Function(int x1, [List<Function> x]) Function(int x);
 | 
| -typedef F17<T>
 | 
| -    = Function([List<T> x1]) Function(int x);
 | 
| -typedef F18<T>
 | 
| -    = void Function(int x, [Function x1]) Function(int x);
 | 
| -typedef F19<T>
 | 
| -    = void Function(int y, {core.List<core.int> x}) Function(int x);
 | 
| -typedef F20<T>
 | 
| -    = Function Function<A>(List<T> x) Function(int x);
 | 
| -typedef F21<T>
 | 
| -    = List<T> Function<A>() Function(int x);
 | 
| -typedef F22<T>
 | 
| -    = List<A> Function<A>(A x) Function(int x);
 | 
| +typedef F0<T> = Function Function(int y, [List<Function> x]);
 | 
| +typedef F1<T> = core.List<core.int> Function(int x0, [Function x]);
 | 
| +typedef F2<T> = Function([int x]);
 | 
| +typedef F3<T> = void Function([List<T> x]);
 | 
| +typedef F4<T> = int Function(int x1) Function(int x);
 | 
| +typedef F5<T> = int Function(int x, [List<Function> x1]) Function(int x);
 | 
| +typedef F6<T> = int Function(int y, {List<T> x}) Function(int x);
 | 
| +typedef F7<T> = Function Function([List<Function> x]) Function(int x);
 | 
| +typedef F8<T> = Function Function(List<T> x1) Function(int x);
 | 
| +typedef F9<T> = List<Function> Function(int x2, [Function x3]) Function(int x);
 | 
| +typedef F10<T> = List<Function> Function(int x1, {core.List<core.int> x})
 | 
| +    Function(int x);
 | 
| +typedef F11<T> = core.List<core.int> Function(Function x) Function(int x);
 | 
| +typedef F12<T> = core.List<core.int> Function(int y, [core.List<core.int> x])
 | 
| +    Function(int x);
 | 
| +typedef F13<T> = List<T> Function([int x1]) Function(int x);
 | 
| +typedef F14<T> = List<T> Function({List<Function> x}) Function(int x);
 | 
| +typedef F15<T> = List<T> Function() Function(int x);
 | 
| +typedef F16<T> = Function(int x1, [List<Function> x]) Function(int x);
 | 
| +typedef F17<T> = Function([List<T> x1]) Function(int x);
 | 
| +typedef F18<T> = void Function(int x, [Function x1]) Function(int x);
 | 
| +typedef F19<T> = void Function(int y, {core.List<core.int> x}) Function(int x);
 | 
| +typedef F20<T> = Function Function<A>(List<T> x) Function(int x);
 | 
| +typedef F21<T> = List<T> Function<A>() Function(int x);
 | 
| +typedef F22<T> = List<A> Function<A>(A x) Function(int x);
 | 
|  
 | 
|  Function f0(int y, [List<Function> x]) => null;
 | 
|  core.List<core.int> f1(int x0, [Function x]) => null;
 | 
| @@ -283,7 +255,7 @@ class U81<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);
 | 
|          });
 | 
| @@ -384,7 +356,7 @@ class U81<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);
 | 
|          });
 | 
| @@ -460,7 +432,7 @@ class U81<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);
 | 
|          });
 | 
| @@ -524,7 +496,8 @@ class U81<T> {
 | 
|  
 | 
|      Expect.isTrue(m10 is F10);
 | 
|      Expect.isTrue(m10 is List<Function> Function(int x1,
 | 
| -        {core.List<core.int> x}) Function(int x));
 | 
| +            {core.List<core.int> x})
 | 
| +        Function(int x));
 | 
|      Expect.isTrue(confuse(m10) is F10);
 | 
|      // In checked mode, verifies the type.
 | 
|      x10 = m10;
 | 
| @@ -575,7 +548,8 @@ class U81<T> {
 | 
|  
 | 
|      Expect.isTrue(m12 is F12);
 | 
|      Expect.isTrue(m12 is core.List<core.int> Function(int y,
 | 
| -        [core.List<core.int> x]) Function(int x));
 | 
| +            [core.List<core.int> x])
 | 
| +        Function(int x));
 | 
|      Expect.isTrue(confuse(m12) is F12);
 | 
|      // In checked mode, verifies the type.
 | 
|      x12 = m12;
 | 
| @@ -614,7 +588,7 @@ class U81<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);
 | 
|          });
 | 
| @@ -666,7 +640,7 @@ class U81<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);
 | 
|          });
 | 
| @@ -718,7 +692,7 @@ class U81<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);
 | 
|          });
 | 
| @@ -794,7 +768,7 @@ class U81<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);
 | 
|          });
 | 
| @@ -895,7 +869,7 @@ class U81<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);
 | 
|          });
 | 
| @@ -947,7 +921,7 @@ class U81<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);
 | 
|          });
 | 
| 
 |