Version 3.5.0-161.0.dev

Merge 8b8ec2a into dev
dart-lang · May 16, 2024 · b64b487 · b64b487
2 parents 1600c3b + 8b8ec2a
commit b64b487
Show file tree

Hide file tree

Showing 59 changed files with 183 additions and 320 deletions.
diff --git a/pkg/_fe_analyzer_shared/test/constants/data/function.dart b/pkg/_fe_analyzer_shared/test/constants/data/function.dart
@@ -8,22 +8,24 @@ Map<T, S> method2<T, S>(T t, S s) => {t: s};
 const function0 = /*cfe.Function(method1)*/ method1;
 
 const int Function(int) instantiation0 =
-    /*cfe.Instantiation(method1<int>)*/ method1;
+    /*cfe.Instantiation(method1<int!>)*/ method1;
 
 const Map<String, int> Function(String, int) instantiation1 =
-    /*cfe.Instantiation(method2<String,int>)*/ method2;
+    /*cfe.Instantiation(method2<String!,int!>)*/ method2;
 
 main() {
   print(
       /*cfe|dart2js.Function(method1)*/
       /*analyzer.Function(method1,type=T Function<T>(T))*/
       function0);
   print(
-      /*cfe|dart2js.Instantiation(method1<int>)*/
+      /*cfe.Instantiation(method1<int!>)*/
+      /*dart2js.Instantiation(method1<int>)*/
       /*analyzer.Function(method1,type=int Function(int))*/
       instantiation0);
   print(
-      /*cfe|dart2js.Instantiation(method2<String,int>)*/
+      /*cfe.Instantiation(method2<String!,int!>)*/
+      /*dart2js.Instantiation(method2<String,int>)*/
       /*analyzer.Function(method2,type=Map<String, int> Function(String, int))*/
       instantiation1);
 }
diff --git a/pkg/_fe_analyzer_shared/test/constants/data/list.dart b/pkg/_fe_analyzer_shared/test/constants/data/list.dart
@@ -6,18 +6,20 @@ const list0 = /*cfe.List<dynamic>()*/ [];
 
 // TODO(johnniwinther): This seems like an odd offset for the constant. It
 // should probably be at the start of the type arguments.
-const list1 = <int> /*cfe.List<int>()*/ [];
+const list1 = <int> /*cfe.List<int!>()*/ [];
 
-const List<int> list2 = /*cfe.List<int>()*/ [];
+const List<int> list2 = /*cfe.List<int!>()*/ [];
 
-const list3 = /*cfe.List<int>(Int(42))*/ [42];
+const list3 = /*cfe.List<int!>(Int(42))*/ [42];
 
-const list4 = /*cfe.List<int>(Int(42),Int(87))*/ [42, 87];
+const list4 = /*cfe.List<int!>(Int(42),Int(87))*/ [42, 87];
 
 main() {
   print(/*List<dynamic>()*/ list0);
-  print(/*List<int>()*/ list1);
-  print(/*List<int>()*/ list2);
-  print(/*List<int>(Int(42))*/ list3);
-  print(/*List<int>(Int(42),Int(87))*/ list4);
+  print(/*cfe.List<int!>()*/ /*analyzer|dart2js.List<int>()*/ list1);
+  print(/*cfe.List<int!>()*/ /*analyzer|dart2js.List<int>()*/ list2);
+  print(
+      /*cfe.List<int!>(Int(42))*/ /*analyzer|dart2js.List<int>(Int(42))*/ list3);
+  print(
+      /*cfe.List<int!>(Int(42),Int(87))*/ /*analyzer|dart2js.List<int>(Int(42),Int(87))*/ list4);
 }
diff --git a/pkg/_fe_analyzer_shared/test/constants/data/map.dart b/pkg/_fe_analyzer_shared/test/constants/data/map.dart
@@ -6,22 +6,24 @@ const map0 = /*cfe.Map<dynamic,dynamic>()*/ {};
 
 // TODO(johnniwinther): This seems like an odd offset for the constant. It
 // should probably be at the start of the type arguments.
-const map1 = <String, int> /*cfe.Map<String,int>()*/ {};
+const map1 = <String, int> /*cfe.Map<String!,int!>()*/ {};
 
-const Map<String, int> map2 = /*cfe.Map<String,int>()*/ {};
+const Map<String, int> map2 = /*cfe.Map<String!,int!>()*/ {};
 
-const map3 = /*cfe.Map<String,int>(String(foo):Int(42))*/ {'foo': 42};
+const map3 = /*cfe.Map<String!,int!>(String(foo):Int(42))*/ {'foo': 42};
 
-const map4 = /*cfe.Map<String,int>(String(foo):Int(42),String(bar):Int(87))*/
+const map4 = /*cfe.Map<String!,int!>(String(foo):Int(42),String(bar):Int(87))*/
     {'foo': 42, 'bar': 87};
 
 main() {
   print(
       /*analyzer.Map<dynamic, dynamic>()*/ /*cfe|dart2js.Map<dynamic,dynamic>()*/ map0);
-  print(/*analyzer.Map<String, int>()*/ /*cfe|dart2js.Map<String,int>()*/ map1);
-  print(/*analyzer.Map<String, int>()*/ /*cfe|dart2js.Map<String,int>()*/ map2);
   print(
-      /*analyzer.Map<String, int>(String(foo):Int(42))*/ /*cfe|dart2js.Map<String,int>(String(foo):Int(42))*/ map3);
+      /*analyzer.Map<String, int>()*/ /*cfe.Map<String!,int!>()*/ /*dart2js.Map<String,int>()*/ map1);
   print(
-      /*analyzer.Map<String, int>(String(foo):Int(42),String(bar):Int(87))*/ /*cfe|dart2js.Map<String,int>(String(foo):Int(42),String(bar):Int(87))*/ map4);
+      /*analyzer.Map<String, int>()*/ /*cfe.Map<String!,int!>()*/ /*dart2js.Map<String,int>()*/ map2);
+  print(
+      /*analyzer.Map<String, int>(String(foo):Int(42))*/ /*cfe.Map<String!,int!>(String(foo):Int(42))*/ /*dart2js.Map<String,int>(String(foo):Int(42))*/ map3);
+  print(
+      /*analyzer.Map<String, int>(String(foo):Int(42),String(bar):Int(87))*/ /*cfe.Map<String!,int!>(String(foo):Int(42),String(bar):Int(87))*/ /*dart2js.Map<String,int>(String(foo):Int(42),String(bar):Int(87))*/ map4);
 }
diff --git a/pkg/_fe_analyzer_shared/test/constants/data/set.dart b/pkg/_fe_analyzer_shared/test/constants/data/set.dart
@@ -8,21 +8,22 @@ const Set set0 = /*cfe.Set<dynamic>()*/ {};
 // TODO(johnniwinther): This seems like an odd offset for the constant. It
 // should probably be at the start of the type arguments.
 // ignore: sdk_version_set_literal
-const set1 = <int> /*cfe.Set<int>()*/ {};
+const set1 = <int> /*cfe.Set<int!>()*/ {};
 
 // ignore: sdk_version_set_literal
-const Set<int> set2 = /*cfe.Set<int>()*/ {};
+const Set<int> set2 = /*cfe.Set<int!>()*/ {};
 
 // ignore: sdk_version_set_literal
-const set3 = /*cfe.Set<int>(Int(42))*/ {42};
+const set3 = /*cfe.Set<int!>(Int(42))*/ {42};
 
 // ignore: sdk_version_set_literal
-const set4 = /*cfe.Set<int>(Int(42),Int(87))*/ {42, 87};
+const set4 = /*cfe.Set<int!>(Int(42),Int(87))*/ {42, 87};
 
 main() {
   print(/*Set<dynamic>()*/ set0);
-  print(/*Set<int>()*/ set1);
-  print(/*Set<int>()*/ set2);
-  print(/*Set<int>(Int(42))*/ set3);
-  print(/*Set<int>(Int(42),Int(87))*/ set4);
+  print(/*cfe.Set<int!>()*/ /*analyzer|dart2js.Set<int>()*/ set1);
+  print(/*cfe.Set<int!>()*/ /*analyzer|dart2js.Set<int>()*/ set2);
+  print(/*cfe.Set<int!>(Int(42))*/ /*analyzer|dart2js.Set<int>(Int(42))*/ set3);
+  print(
+      /*cfe.Set<int!>(Int(42),Int(87))*/ /*analyzer|dart2js.Set<int>(Int(42),Int(87))*/ set4);
 }
diff --git a/pkg/_fe_analyzer_shared/test/constants/data/type_literals.dart b/pkg/_fe_analyzer_shared/test/constants/data/type_literals.dart
@@ -9,34 +9,38 @@ typedef GenericTypedef<T> = void Function(T);
 typedef GenericFunctionTypedef = void Function<T>(T);
 typedef TypedefWithFutureOr = void Function<T>(FutureOr<T>);
 
-const typedef = /*cfe.TypeLiteral(dynamic Function())*/ Typedef;
+const typedef = /*cfe.TypeLiteral(dynamic Function()!)*/ Typedef;
 const genericTypedef =
-    /*cfe.TypeLiteral(void Function(dynamic))*/ GenericTypedef;
+    /*cfe.TypeLiteral(void Function(dynamic)!)*/ GenericTypedef;
 const genericFunctionTypedef =
-    /*cfe.TypeLiteral(void Function<T>(T))*/ GenericFunctionTypedef;
+    /*cfe.TypeLiteral(void Function<T>(T%)!)*/ GenericFunctionTypedef;
 const typedefWithFutureOr =
-    /*cfe.TypeLiteral(void Function<T>(FutureOr<T>))*/ TypedefWithFutureOr;
+    /*cfe.TypeLiteral(void Function<T>(FutureOr<T%>%)!)*/ TypedefWithFutureOr;
 const futureOr = /*cfe.TypeLiteral(dynamic)*/ FutureOr;
 const null_ = /*cfe.TypeLiteral(Null)*/ Null;
 
 main() {
   print(
-      /*cfe|analyzer.TypeLiteral(dynamic Function())*/
+      /*cfe.TypeLiteral(dynamic Function()!)*/
+      /*analyzer.TypeLiteral(dynamic Function())*/
       /*dart2js.TypeLiteral(()->dynamic)*/
       typedef);
 
   print(
-      /*cfe|analyzer.TypeLiteral(void Function(dynamic))*/
+      /*cfe.TypeLiteral(void Function(dynamic)!)*/
+      /*analyzer.TypeLiteral(void Function(dynamic))*/
       /*dart2js.TypeLiteral((dynamic)->void)*/
       genericTypedef);
 
   print(
-      /*cfe|analyzer.TypeLiteral(void Function<T>(T))*/
+      /*cfe.TypeLiteral(void Function<T>(T%)!)*/
+      /*analyzer.TypeLiteral(void Function<T>(T))*/
       /*dart2js.TypeLiteral((0)->void)*/
       genericFunctionTypedef);
 
   print(
-      /*cfe|analyzer.TypeLiteral(void Function<T>(FutureOr<T>))*/
+      /*cfe.TypeLiteral(void Function<T>(FutureOr<T%>%)!)*/
+      /*analyzer.TypeLiteral(void Function<T>(FutureOr<T>))*/
       /*dart2js.TypeLiteral((FutureOr<0>)->void)*/
       typedefWithFutureOr);
 

diff --git a/pkg/front_end/lib/src/api_unstable/bazel_worker.dart b/pkg/front_end/lib/src/api_unstable/bazel_worker.dart
@@ -56,7 +56,7 @@ Future<InitializedCompilerState> initializeIncrementalCompiler(
   Map<String, String> environmentDefines, {
   bool trackNeededDillLibraries = false,
   bool verbose = false,
-  NnbdMode nnbdMode = NnbdMode.Weak,
+  NnbdMode nnbdMode = NnbdMode.Strong,
   bool requirePrebuiltMacros = false,
   List<String> precompiledMacros = const [],
   SerializationMode macroSerializationMode = SerializationMode.byteData,
@@ -100,7 +100,7 @@ InitializedCompilerState initializeCompiler(
   Iterable<String> experiments,
   Map<String, String>? environmentDefines, {
   bool verbose = false,
-  NnbdMode nnbdMode = NnbdMode.Weak,
+  NnbdMode nnbdMode = NnbdMode.Strong,
   bool requirePrebuiltMacros = false,
   List<String> precompiledMacros = const [],
   SerializationMode macroSerializationMode = SerializationMode.byteData,

diff --git a/pkg/front_end/lib/src/api_unstable/modular_incremental_compilation.dart b/pkg/front_end/lib/src/api_unstable/modular_incremental_compilation.dart
@@ -47,7 +47,7 @@ Future<InitializedCompilerState> initializeIncrementalCompiler(
     bool omitPlatform = false,
     bool trackNeededDillLibraries = false,
     bool verbose = false,
-    NnbdMode nnbdMode = NnbdMode.Weak,
+    NnbdMode nnbdMode = NnbdMode.Strong,
     bool requirePrebuiltMacros = false,
     List<String> precompiledMacros = const [],
     SerializationMode macroSerializationMode =

diff --git a/pkg/front_end/lib/src/fasta/kernel/hierarchy/delayed.dart b/pkg/front_end/lib/src/fasta/kernel/hierarchy/delayed.dart
@@ -67,8 +67,7 @@ class DelayedOverrideCheck implements DelayedCheck {
     void callback(Member interfaceMember, bool isSetter) {
       _classBuilder.checkOverride(membersBuilder.hierarchyBuilder.types,
           membersBuilder, declaredMember, interfaceMember, isSetter, callback,
-          isInterfaceCheck: !_classBuilder.isMixinApplication,
-          declaredNeedsLegacyErasure: false);
+          isInterfaceCheck: !_classBuilder.isMixinApplication);
     }
 
     for (ClassMember overriddenMember in _overriddenMembers) {