Merge branch 'master' of https://github.com/dart-lang/co19
diff --git a/LanguageFeatures/nnbd/generics_A01_t01.dart b/LanguageFeatures/nnbd/generics_A01_t01.dart
index b44ab09..b94c242 100644
--- a/LanguageFeatures/nnbd/generics_A01_t01.dart
+++ b/LanguageFeatures/nnbd/generics_A01_t01.dart
@@ -8,6 +8,7 @@
  * [Object?].
  * @description Check that default class type parameter is treated as [Object?]
  * dynamically.
+ * @Issue 40367
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/nnbd/generics_A01_t02.dart b/LanguageFeatures/nnbd/generics_A01_t02.dart
index 626b3da..e4a1f7d 100644
--- a/LanguageFeatures/nnbd/generics_A01_t02.dart
+++ b/LanguageFeatures/nnbd/generics_A01_t02.dart
@@ -8,6 +8,7 @@
  * [Object?].
  * @description Check that default class type parameter is treated as [Object?]
  * statically.
+ * @Issue 40368
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/nnbd/generics_A01_t05.dart b/LanguageFeatures/nnbd/generics_A01_t05.dart
index 236bfdc..933352a 100644
--- a/LanguageFeatures/nnbd/generics_A01_t05.dart
+++ b/LanguageFeatures/nnbd/generics_A01_t05.dart
@@ -9,6 +9,7 @@
  * @description Check that default function typedef type parameter is treated as
  * [Object?] dynamically. Typedef is in the form [typedef <typeIdentifier>
  * <typeParameters> = <functionType>].
+ * @Issue 40367
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/nnbd/generics_A01_t06.dart b/LanguageFeatures/nnbd/generics_A01_t06.dart
index 9afeccf..860eee9 100644
--- a/LanguageFeatures/nnbd/generics_A01_t06.dart
+++ b/LanguageFeatures/nnbd/generics_A01_t06.dart
@@ -9,6 +9,7 @@
  * @description Check that default function typedef type parameter is treated as
  * [Object?] statically. Typedef is in the form [typedef <typeIdentifier>
  * <typeParameters> = <functionType>].
+ * @Issue 40368
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
diff --git a/LanguageFeatures/nnbd/generics_A01_t07.dart b/LanguageFeatures/nnbd/generics_A01_t07.dart
index b6150e3..1744a8e 100644
--- a/LanguageFeatures/nnbd/generics_A01_t07.dart
+++ b/LanguageFeatures/nnbd/generics_A01_t07.dart
@@ -8,6 +8,7 @@
  * [Object?].
  * @description Check that default function type parameter is treated as
  * [Object?].
+ * @Issue 40367
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable
@@ -15,22 +16,24 @@
 
 import "../../Utils/expect.dart";
 
+dynamic i = null;
+
 void test1<T>() {
   Expect.equals(typeOf<Object?>(), T);
 }
 
 T test2<T>() {
   Expect.equals(typeOf<Object?>(), T);
-  return null;
+  return i;
 }
 
 void test3<T>(T t) {
   Expect.equals(typeOf<Object?>(), T);
 }
 
-T test4<T>([T t]) {
+T test4<T>(T t) {
   Expect.equals(typeOf<Object?>(), T);
-  return null;
+  return i;
 }
 
 void test5<T1, T2, T3>() {
@@ -43,7 +46,6 @@
   test1();
   test2();
   test3(1);
-  test4();
   test4(11);
   test5();
 }
diff --git a/LanguageFeatures/nnbd/generics_A01_t08.dart b/LanguageFeatures/nnbd/generics_A01_t08.dart
index b38185a..2633c5c 100644
--- a/LanguageFeatures/nnbd/generics_A01_t08.dart
+++ b/LanguageFeatures/nnbd/generics_A01_t08.dart
@@ -8,6 +8,7 @@
  * [Object?].
  * @description Check that default function type alias parameter is treated as
  * [Object?] dynamically.
+ * @Issue 40367
  * @author iarkh@unipro.ru
  */
 // SharedOptions=--enable-experiment=non-nullable