| Index: tests/language/function_type/function_type72_test.dart
 | 
| diff --git a/tests/language/function_type/function_type72_test.dart b/tests/language/function_type/function_type72_test.dart
 | 
| index 4ef0927f186a706e4489fa25f6550382de7e60ad..4724bf69f3a3a2c97aeaed7d188935e066587db4 100644
 | 
| --- a/tests/language/function_type/function_type72_test.dart
 | 
| +++ b/tests/language/function_type/function_type72_test.dart
 | 
| @@ -19,58 +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([Function x1]);
 | 
| -typedef F1<T>
 | 
| -    = core.List<core.int> Function(int x0);
 | 
| -typedef F2<T>
 | 
| -    = List<T> Function(List<T> x0);
 | 
| -typedef F3<T>
 | 
| -    = void Function(int y, [core.List<core.int> x]);
 | 
| -typedef F4<T>
 | 
| -    = int Function(int x0, [int x]) Function();
 | 
| -typedef F5<T>
 | 
| -    = int Function([List<Function> x1]) Function();
 | 
| -typedef F6<T>
 | 
| -    = int Function({List<T> x}) Function();
 | 
| -typedef F7<T>
 | 
| -    = Function Function(int y, {Function x}) Function();
 | 
| -typedef F8<T>
 | 
| -    = Function Function(int x0, [List<T> x]) Function();
 | 
| -typedef F9<T>
 | 
| -    = List<Function> Function(Function x0) Function();
 | 
| -typedef F10<T>
 | 
| -    = List<Function> Function(int x, [core.List<core.int> x2]) Function();
 | 
| -typedef F11<T>
 | 
| -    = core.List<core.int> Function(int x0, {int x}) Function();
 | 
| -typedef F12<T>
 | 
| -    = core.List<core.int> Function([core.List<core.int> x]) Function();
 | 
| -typedef F13<T>
 | 
| -    = List<T> Function(int y, [int x]) Function();
 | 
| -typedef F14<T>
 | 
| -    = List<T> Function(int x1, [List<Function> x2]) Function();
 | 
| -typedef F15<T>
 | 
| -    = List<T> Function(int x0, {List<T> x}) Function();
 | 
| -typedef F16<T>
 | 
| -    = Function(List<Function> x) Function();
 | 
| -typedef F17<T>
 | 
| -    = Function(int y, [List<T> x]) Function();
 | 
| -typedef F18<T>
 | 
| -    = void Function([Function x1]) Function();
 | 
| -typedef F19<T>
 | 
| -    = void Function({core.List<core.int> x}) Function();
 | 
| -typedef F20<T>
 | 
| -    = Function Function<A>(List<Function> x) Function();
 | 
| -typedef F21<T>
 | 
| -    = List<T> Function<A>(core.List<core.int> x) Function();
 | 
| -typedef F22<T>
 | 
| -    = List<A> Function<A>(List<T> x) Function();
 | 
| +typedef F0<T> = Function Function([Function x1]);
 | 
| +typedef F1<T> = core.List<core.int> Function(int x0);
 | 
| +typedef F2<T> = List<T> Function(List<T> x0);
 | 
| +typedef F3<T> = void Function(int y, [core.List<core.int> x]);
 | 
| +typedef F4<T> = int Function(int x0, [int x]) Function();
 | 
| +typedef F5<T> = int Function([List<Function> x1]) Function();
 | 
| +typedef F6<T> = int Function({List<T> x}) Function();
 | 
| +typedef F7<T> = Function Function(int y, {Function x}) Function();
 | 
| +typedef F8<T> = Function Function(int x0, [List<T> x]) Function();
 | 
| +typedef F9<T> = List<Function> Function(Function x0) Function();
 | 
| +typedef F10<T> = List<Function> Function(int x, [core.List<core.int> x2])
 | 
| +    Function();
 | 
| +typedef F11<T> = core.List<core.int> Function(int x0, {int x}) Function();
 | 
| +typedef F12<T> = core.List<core.int> Function([core.List<core.int> x])
 | 
| +    Function();
 | 
| +typedef F13<T> = List<T> Function(int y, [int x]) Function();
 | 
| +typedef F14<T> = List<T> Function(int x1, [List<Function> x2]) Function();
 | 
| +typedef F15<T> = List<T> Function(int x0, {List<T> x}) Function();
 | 
| +typedef F16<T> = Function(List<Function> x) Function();
 | 
| +typedef F17<T> = Function(int y, [List<T> x]) Function();
 | 
| +typedef F18<T> = void Function([Function x1]) Function();
 | 
| +typedef F19<T> = void Function({core.List<core.int> x}) Function();
 | 
| +typedef F20<T> = Function Function<A>(List<Function> x) Function();
 | 
| +typedef F21<T> = List<T> Function<A>(core.List<core.int> x) Function();
 | 
| +typedef F22<T> = List<A> Function<A>(List<T> x) Function();
 | 
|  
 | 
|  Function f0([Function x0]) => null;
 | 
|  core.List<core.int> f1(int x0) => null;
 | 
| @@ -256,7 +229,7 @@ class U72<T> {
 | 
|        Expect.equals(tIsDynamic, m2 is F2<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m2) is F2<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x2 = (f2 as dynamic);
 | 
|          });
 | 
| @@ -380,7 +353,7 @@ class U72<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);
 | 
|          });
 | 
| @@ -456,7 +429,7 @@ class U72<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);
 | 
|          });
 | 
| @@ -517,8 +490,8 @@ class U72<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m10 is F10);
 | 
| -    Expect.isTrue(m10 is List<Function> Function(int x,
 | 
| -        [core.List<core.int> x2]) Function());
 | 
| +    Expect.isTrue(m10
 | 
| +        is List<Function> Function(int x, [core.List<core.int> x2]) Function());
 | 
|      Expect.isTrue(confuse(m10) is F10);
 | 
|      // In checked mode, verifies the type.
 | 
|      x10 = m10;
 | 
| @@ -567,8 +540,8 @@ class U72<T> {
 | 
|      }
 | 
|  
 | 
|      Expect.isTrue(m12 is F12);
 | 
| -    Expect.isTrue(m12 is core.List<core.int> Function(
 | 
| -        [core.List<core.int> x]) Function());
 | 
| +    Expect.isTrue(m12 is core.List<core.int> Function([core.List<core.int> x])
 | 
| +        Function());
 | 
|      Expect.isTrue(confuse(m12) is F12);
 | 
|      // In checked mode, verifies the type.
 | 
|      x12 = m12;
 | 
| @@ -607,7 +580,7 @@ class U72<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 +633,7 @@ class U72<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);
 | 
|          });
 | 
| @@ -712,7 +685,7 @@ class U72<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);
 | 
|          });
 | 
| @@ -788,7 +761,7 @@ class U72<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);
 | 
|          });
 | 
| @@ -912,7 +885,7 @@ class U72<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);
 | 
|          });
 | 
| @@ -964,7 +937,7 @@ class U72<T> {
 | 
|        Expect.equals(tIsDynamic, m22 is F22<bool>);
 | 
|        Expect.equals(tIsDynamic, confuse(m22) is F22<bool>);
 | 
|      } else {
 | 
| -      if (inCheckedMode) {
 | 
| +      if (typeAssertionsEnabled) {
 | 
|          Expect.throws(() {
 | 
|            x22 = (f22 as dynamic);
 | 
|          });
 | 
| 
 |