| Index: tests/language/function_type/function_type88_test.dart
 | 
| diff --git a/tests/language/function_type/function_type88_test.dart b/tests/language/function_type/function_type88_test.dart
 | 
| index 1a94f58598161c4f748214f919475a9ea6ad595a..0f38b68fe276b51f70ef5b81070db38bba8ddbfd 100644
 | 
| --- a/tests/language/function_type/function_type88_test.dart
 | 
| +++ b/tests/language/function_type/function_type88_test.dart
 | 
| @@ -19,58 +19,30 @@ 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, [int x2]) Function();
 | 
| -typedef F5<T>
 | 
| -    = int Function(int x0, {List<Function> x}) Function();
 | 
| -typedef F6<T>
 | 
| -    = Function Function(int x) Function();
 | 
| -typedef F7<T>
 | 
| -    = Function Function(int y, [List<Function> x]) Function();
 | 
| -typedef F8<T>
 | 
| -    = Function Function(int x1, [List<T> x2]) Function();
 | 
| -typedef F9<T>
 | 
| -    = List<Function> Function({Function x}) Function();
 | 
| -typedef F10<T>
 | 
| -    = List<Function> Function(List<T> x) Function();
 | 
| -typedef F11<T>
 | 
| -    = core.List<core.int> Function(int x0, [Function x]) Function();
 | 
| -typedef F12<T>
 | 
| -    = core.List<core.int> Function([core.List<core.int> x1]) Function();
 | 
| -typedef F13<T>
 | 
| -    = List<T> Function(int x, [int x2]) Function();
 | 
| -typedef F14<T>
 | 
| -    = List<T> Function(int y, {List<Function> x}) Function();
 | 
| -typedef F15<T>
 | 
| -    = Function([int x]) Function();
 | 
| -typedef F16<T>
 | 
| -    = Function(List<Function> x0) Function();
 | 
| -typedef F17<T>
 | 
| -    = Function(int x, [List<T> x2]) Function();
 | 
| -typedef F18<T>
 | 
| -    = void Function(int x0, {Function x}) Function();
 | 
| -typedef F19<T>
 | 
| -    = void Function([List<T> x]) Function();
 | 
| -typedef F20<T>
 | 
| -    = Function Function<A>(A x) Function();
 | 
| -typedef F21<T>
 | 
| -    = List<T> Function<A>(List<A> x) Function();
 | 
| -typedef F22<T>
 | 
| -    = void Function<A>(int x) Function();
 | 
| +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, [int x2]) Function();
 | 
| +typedef F5<T> = int Function(int x0, {List<Function> x}) Function();
 | 
| +typedef F6<T> = Function Function(int x) Function();
 | 
| +typedef F7<T> = Function Function(int y, [List<Function> x]) Function();
 | 
| +typedef F8<T> = Function Function(int x1, [List<T> x2]) Function();
 | 
| +typedef F9<T> = List<Function> Function({Function x}) Function();
 | 
| +typedef F10<T> = List<Function> Function(List<T> x) Function();
 | 
| +typedef F11<T> = core.List<core.int> Function(int x0, [Function x]) Function();
 | 
| +typedef F12<T> = core.List<core.int> Function([core.List<core.int> x1])
 | 
| +    Function();
 | 
| +typedef F13<T> = List<T> Function(int x, [int x2]) Function();
 | 
| +typedef F14<T> = List<T> Function(int y, {List<Function> x}) Function();
 | 
| +typedef F15<T> = Function([int x]) Function();
 | 
| +typedef F16<T> = Function(List<Function> x0) Function();
 | 
| +typedef F17<T> = Function(int x, [List<T> x2]) Function();
 | 
| +typedef F18<T> = void Function(int x0, {Function x}) Function();
 | 
| +typedef F19<T> = void Function([List<T> x]) Function();
 | 
| +typedef F20<T> = Function Function<A>(A x) Function();
 | 
| +typedef F21<T> = List<T> Function<A>(List<A> x) Function();
 | 
| +typedef F22<T> = void Function<A>(int x) Function();
 | 
|  
 | 
|  Function f0(int y, {List<Function> x}) => null;
 | 
|  core.List<core.int> f1(int x0, {Function x}) => null;
 | 
| @@ -280,7 +252,7 @@ class U88<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);
 | 
|          });
 | 
| @@ -429,7 +401,7 @@ class U88<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);
 | 
|          });
 | 
| @@ -505,7 +477,7 @@ class U88<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);
 | 
|          });
 | 
| @@ -567,8 +539,8 @@ class U88<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m12 is F12);
 | 
| -    Expect.isTrue(m12 is core.List<core.int> Function(
 | 
| -        [core.List<core.int> x1]) Function());
 | 
| +    Expect.isTrue(m12 is core.List<core.int> Function([core.List<core.int> x1])
 | 
| +        Function());
 | 
|      Expect.isTrue(confuse(m12) is F12);
 | 
|      // In checked mode, verifies the type.
 | 
|      x12 = m12;
 | 
| @@ -607,7 +579,7 @@ class U88<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,7 +632,7 @@ class U88<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 +732,7 @@ class U88<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);
 | 
|          });
 | 
| @@ -836,7 +808,7 @@ class U88<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);
 | 
|          });
 | 
| @@ -912,7 +884,7 @@ class U88<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);
 | 
|          });
 | 
| 
 |