From eccaf152eebe66d89174ec7bf00b19952e109f8d Mon Sep 17 00:00:00 2001 From: Johnni Winther Date: Thu, 16 May 2024 07:44:10 +0000 Subject: [PATCH] [cfe] Change more nnbd default modes to strong Change-Id: Iab51c30024764ebd1c82991ad8687e7accf999f9 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/366661 Reviewed-by: Jens Johansen Commit-Queue: Johnni Winther --- .../test/constants/data/function.dart | 10 ++++++---- .../test/constants/data/list.dart | 18 +++++++++-------- .../test/constants/data/map.dart | 18 +++++++++-------- .../test/constants/data/set.dart | 17 ++++++++-------- .../test/constants/data/type_literals.dart | 20 +++++++++++-------- .../lib/src/api_unstable/bazel_worker.dart | 4 ++-- .../modular_incremental_compilation.dart | 2 +- .../lib/src/testing/id_testing_helper.dart | 2 +- pkg/front_end/test/lint_test.status | 1 + .../data/tests/annotations.dart.expect | 4 ++-- .../data/tests/import_conflict.dart.expect | 6 +++--- .../data/tests/targets.dart.expect | 2 +- .../tests/unhandled_annotations.dart.expect | 8 ++++---- 13 files changed, 62 insertions(+), 50 deletions(-) diff --git a/pkg/_fe_analyzer_shared/test/constants/data/function.dart b/pkg/_fe_analyzer_shared/test/constants/data/function.dart index 987b64c5bee..0633b9243b5 100644 --- a/pkg/_fe_analyzer_shared/test/constants/data/function.dart +++ b/pkg/_fe_analyzer_shared/test/constants/data/function.dart @@ -8,10 +8,10 @@ Map method2(T t, S s) => {t: s}; const function0 = /*cfe.Function(method1)*/ method1; const int Function(int) instantiation0 = - /*cfe.Instantiation(method1)*/ method1; + /*cfe.Instantiation(method1)*/ method1; const Map Function(String, int) instantiation1 = - /*cfe.Instantiation(method2)*/ method2; + /*cfe.Instantiation(method2)*/ method2; main() { print( @@ -19,11 +19,13 @@ main() { /*analyzer.Function(method1,type=T Function(T))*/ function0); print( - /*cfe|dart2js.Instantiation(method1)*/ + /*cfe.Instantiation(method1)*/ + /*dart2js.Instantiation(method1)*/ /*analyzer.Function(method1,type=int Function(int))*/ instantiation0); print( - /*cfe|dart2js.Instantiation(method2)*/ + /*cfe.Instantiation(method2)*/ + /*dart2js.Instantiation(method2)*/ /*analyzer.Function(method2,type=Map 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 index 446475ddb9c..c420c30be54 100644 --- 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()*/ []; // TODO(johnniwinther): This seems like an odd offset for the constant. It // should probably be at the start of the type arguments. -const list1 = /*cfe.List()*/ []; +const list1 = /*cfe.List()*/ []; -const List list2 = /*cfe.List()*/ []; +const List list2 = /*cfe.List()*/ []; -const list3 = /*cfe.List(Int(42))*/ [42]; +const list3 = /*cfe.List(Int(42))*/ [42]; -const list4 = /*cfe.List(Int(42),Int(87))*/ [42, 87]; +const list4 = /*cfe.List(Int(42),Int(87))*/ [42, 87]; main() { print(/*List()*/ list0); - print(/*List()*/ list1); - print(/*List()*/ list2); - print(/*List(Int(42))*/ list3); - print(/*List(Int(42),Int(87))*/ list4); + print(/*cfe.List()*/ /*analyzer|dart2js.List()*/ list1); + print(/*cfe.List()*/ /*analyzer|dart2js.List()*/ list2); + print( + /*cfe.List(Int(42))*/ /*analyzer|dart2js.List(Int(42))*/ list3); + print( + /*cfe.List(Int(42),Int(87))*/ /*analyzer|dart2js.List(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 index 006cb791e03..207152bc7d0 100644 --- 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()*/ {}; // TODO(johnniwinther): This seems like an odd offset for the constant. It // should probably be at the start of the type arguments. -const map1 = /*cfe.Map()*/ {}; +const map1 = /*cfe.Map()*/ {}; -const Map map2 = /*cfe.Map()*/ {}; +const Map map2 = /*cfe.Map()*/ {}; -const map3 = /*cfe.Map(String(foo):Int(42))*/ {'foo': 42}; +const map3 = /*cfe.Map(String(foo):Int(42))*/ {'foo': 42}; -const map4 = /*cfe.Map(String(foo):Int(42),String(bar):Int(87))*/ +const map4 = /*cfe.Map(String(foo):Int(42),String(bar):Int(87))*/ {'foo': 42, 'bar': 87}; main() { print( /*analyzer.Map()*/ /*cfe|dart2js.Map()*/ map0); - print(/*analyzer.Map()*/ /*cfe|dart2js.Map()*/ map1); - print(/*analyzer.Map()*/ /*cfe|dart2js.Map()*/ map2); print( - /*analyzer.Map(String(foo):Int(42))*/ /*cfe|dart2js.Map(String(foo):Int(42))*/ map3); + /*analyzer.Map()*/ /*cfe.Map()*/ /*dart2js.Map()*/ map1); print( - /*analyzer.Map(String(foo):Int(42),String(bar):Int(87))*/ /*cfe|dart2js.Map(String(foo):Int(42),String(bar):Int(87))*/ map4); + /*analyzer.Map()*/ /*cfe.Map()*/ /*dart2js.Map()*/ map2); + print( + /*analyzer.Map(String(foo):Int(42))*/ /*cfe.Map(String(foo):Int(42))*/ /*dart2js.Map(String(foo):Int(42))*/ map3); + print( + /*analyzer.Map(String(foo):Int(42),String(bar):Int(87))*/ /*cfe.Map(String(foo):Int(42),String(bar):Int(87))*/ /*dart2js.Map(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 index 26ca6c3ce41..8c8d270cbfc 100644 --- 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()*/ {}; // 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 = /*cfe.Set()*/ {}; +const set1 = /*cfe.Set()*/ {}; // ignore: sdk_version_set_literal -const Set set2 = /*cfe.Set()*/ {}; +const Set set2 = /*cfe.Set()*/ {}; // ignore: sdk_version_set_literal -const set3 = /*cfe.Set(Int(42))*/ {42}; +const set3 = /*cfe.Set(Int(42))*/ {42}; // ignore: sdk_version_set_literal -const set4 = /*cfe.Set(Int(42),Int(87))*/ {42, 87}; +const set4 = /*cfe.Set(Int(42),Int(87))*/ {42, 87}; main() { print(/*Set()*/ set0); - print(/*Set()*/ set1); - print(/*Set()*/ set2); - print(/*Set(Int(42))*/ set3); - print(/*Set(Int(42),Int(87))*/ set4); + print(/*cfe.Set()*/ /*analyzer|dart2js.Set()*/ set1); + print(/*cfe.Set()*/ /*analyzer|dart2js.Set()*/ set2); + print(/*cfe.Set(Int(42))*/ /*analyzer|dart2js.Set(Int(42))*/ set3); + print( + /*cfe.Set(Int(42),Int(87))*/ /*analyzer|dart2js.Set(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 index 42fae727b79..7d78f30907e 100644 --- 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 = void Function(T); typedef GenericFunctionTypedef = void Function(T); typedef TypedefWithFutureOr = void Function(FutureOr); -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))*/ GenericFunctionTypedef; + /*cfe.TypeLiteral(void Function(T%)!)*/ GenericFunctionTypedef; const typedefWithFutureOr = - /*cfe.TypeLiteral(void Function(FutureOr))*/ TypedefWithFutureOr; + /*cfe.TypeLiteral(void Function(FutureOr%)!)*/ 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))*/ + /*cfe.TypeLiteral(void Function(T%)!)*/ + /*analyzer.TypeLiteral(void Function(T))*/ /*dart2js.TypeLiteral((0)->void)*/ genericFunctionTypedef); print( - /*cfe|analyzer.TypeLiteral(void Function(FutureOr))*/ + /*cfe.TypeLiteral(void Function(FutureOr%)!)*/ + /*analyzer.TypeLiteral(void Function(FutureOr))*/ /*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 index c2d33e1515a..4d1a2a31f5f 100644 --- 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 initializeIncrementalCompiler( Map environmentDefines, { bool trackNeededDillLibraries = false, bool verbose = false, - NnbdMode nnbdMode = NnbdMode.Weak, + NnbdMode nnbdMode = NnbdMode.Strong, bool requirePrebuiltMacros = false, List precompiledMacros = const [], SerializationMode macroSerializationMode = SerializationMode.byteData, @@ -100,7 +100,7 @@ InitializedCompilerState initializeCompiler( Iterable experiments, Map? environmentDefines, { bool verbose = false, - NnbdMode nnbdMode = NnbdMode.Weak, + NnbdMode nnbdMode = NnbdMode.Strong, bool requirePrebuiltMacros = false, List 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 index 2d18c10ab6a..709181c83ac 100644 --- 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 initializeIncrementalCompiler( bool omitPlatform = false, bool trackNeededDillLibraries = false, bool verbose = false, - NnbdMode nnbdMode = NnbdMode.Weak, + NnbdMode nnbdMode = NnbdMode.Strong, bool requirePrebuiltMacros = false, List precompiledMacros = const [], SerializationMode macroSerializationMode = diff --git a/pkg/front_end/lib/src/testing/id_testing_helper.dart b/pkg/front_end/lib/src/testing/id_testing_helper.dart index 9acafca98c0..d1b064ac46d 100644 --- a/pkg/front_end/lib/src/testing/id_testing_helper.dart +++ b/pkg/front_end/lib/src/testing/id_testing_helper.dart @@ -48,7 +48,7 @@ class CfeTestConfig extends TestConfig { this.packageConfigUri, this.compileSdk = false, this.targetFlags = const TestTargetFlags(), - this.nnbdMode = NnbdMode.Weak}); + this.nnbdMode = NnbdMode.Strong}); /// Called before running test on [testData]. /// diff --git a/pkg/front_end/test/lint_test.status b/pkg/front_end/test/lint_test.status index 2c8f5332dd0..a5eaf529dd7 100644 --- a/pkg/front_end/test/lint_test.status +++ b/pkg/front_end/test/lint_test.status @@ -13,6 +13,7 @@ front_end/lib/src/api_prototype/lowering_predicates/Exports: Fail front_end/lib/src/api_prototype/static_weak_references/Exports: Fail front_end/lib/src/api_prototype/terminal_color_support/Exports: Fail front_end/lib/src/api_prototype/try_constant_evaluator/Exports: Fail +front_end/lib/src/api_unstable/bazel_worker/Exports: Fail front_end/lib/src/fasta/codes/fasta_codes/Exports: Fail front_end/lib/src/fasta/messages/Exports: Fail front_end/lib/src/testing/id_testing_helper/Exports: Fail diff --git a/pkg/front_end/test/macros/application/data/tests/annotations.dart.expect b/pkg/front_end/test/macros/application/data/tests/annotations.dart.expect index 60bd5e2e525..8ac45f261dd 100644 --- a/pkg/front_end/test/macros/application/data/tests/annotations.dart.expect +++ b/pkg/front_end/test/macros/application/data/tests/annotations.dart.expect @@ -24,8 +24,8 @@ constants { #C5 = ann::AnnotationsMacro {object:#C1, additional:#C4} #C6 = [] #C7 = ann::AnnotationsMacro {object:#C6, additional:#C2} - #C8 = [#C1] + #C8 = [#C1] #C9 = ann::AnnotationsMacro {object:#C8, additional:#C2} - #C10 = [#C1, #C4] + #C10 = [#C1, #C4] #C11 = ann::AnnotationsMacro {object:#C10, additional:#C2} } diff --git a/pkg/front_end/test/macros/application/data/tests/import_conflict.dart.expect b/pkg/front_end/test/macros/application/data/tests/import_conflict.dart.expect index 051eb74d171..7f0eff4204b 100644 --- a/pkg/front_end/test/macros/application/data/tests/import_conflict.dart.expect +++ b/pkg/front_end/test/macros/application/data/tests/import_conflict.dart.expect @@ -23,7 +23,7 @@ static method /* from dart-macro+org-dartlang-test:///a/b/c/main.dart */ functio constants { #C1 = mac::ImportConflictMacro {} - #C2 = TypeLiteralConstant(core::int*) - #C3 = TypeLiteralConstant(FutureOr*) - #C4 = TypeLiteralConstant(con::JsonCodec*) + #C2 = TypeLiteralConstant(core::int) + #C3 = TypeLiteralConstant(FutureOr) + #C4 = TypeLiteralConstant(con::JsonCodec) } diff --git a/pkg/front_end/test/macros/application/data/tests/targets.dart.expect b/pkg/front_end/test/macros/application/data/tests/targets.dart.expect index d46c482fc27..9b5e1e933e7 100644 --- a/pkg/front_end/test/macros/application/data/tests/targets.dart.expect +++ b/pkg/front_end/test/macros/application/data/tests/targets.dart.expect @@ -2019,5 +2019,5 @@ constants { #C41 = 0 #C42 = "a" #C43 = self::Enum {index:#C41, _name:#C42} - #C44 = [#C43] + #C44 = [#C43] } diff --git a/pkg/front_end/test/macros/application/data/tests/unhandled_annotations.dart.expect b/pkg/front_end/test/macros/application/data/tests/unhandled_annotations.dart.expect index bd8aaa2f7e8..dbe95c2f2d4 100644 --- a/pkg/front_end/test/macros/application/data/tests/unhandled_annotations.dart.expect +++ b/pkg/front_end/test/macros/application/data/tests/unhandled_annotations.dart.expect @@ -123,7 +123,7 @@ constants { #C5 = ann::AnnotationsMacro {object:#C4, additional:#C2} #C6 = {} #C7 = ann::AnnotationsMacro {object:#C6, additional:#C2} - #C8 = <() →* void>{} + #C8 = <() → void>{} #C9 = ann::AnnotationsMacro {object:#C8, additional:#C2} #C10 = #a #C11 = ann::AnnotationsMacro {object:#C10, additional:#C2} @@ -131,16 +131,16 @@ constants { #C13 = ann::AnnotationsMacro {object:#C12, additional:#C2} #C14 = (#C12) #C15 = ann::AnnotationsMacro {object:#C14, additional:#C2} - #C16 = <(core::int*, {required a: core::String*})*>{} + #C16 = <(core::int, {required a: core::String})>{} #C17 = ann::AnnotationsMacro {object:#C16, additional:#C2} #C18 = true #C19 = ann::AnnotationsMacro {object:#C18, additional:#C2} #C20 = 3 #C21 = ann::AnnotationsMacro {object:#C20, additional:#C2} #C22 = static-tearoff self::id - #C23 = instantiation #C22 + #C23 = instantiation #C22 #C24 = ann::AnnotationsMacro {object:#C23, additional:#C2} - #C25 = TypeLiteralConstant(self::Class*) + #C25 = TypeLiteralConstant(self::Class) #C26 = ann::AnnotationsMacro {object:#C25, additional:#C2} #C27 = 2 }