dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[cfe] Change more nnbd default modes to strong

Browse Source 
Change-Id: Iab51c30024764ebd1c82991ad8687e7accf999f9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/366661
Reviewed-by: Jens Johansen <jensj@google.com>
Commit-Queue: Johnni Winther <johnniwinther@google.com>
This commit is contained in:
Johnni Winther
2024-05-16 07:44:10 +00:00
committed by Commit Queue
parent 5a6b2421bf
commit eccaf152ee
13 changed files with 62 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/_fe_analyzer_shared/test/constants/data/function.dart
+6 -4
View File
@@ -8,10 +8,10 @@ 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(
@@ -19,11 +19,13 @@ main() {
/*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);
}
pkg/_fe_analyzer_shared/test/constants/data/list.dart
+10 -8
View File
@@ -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);
}
pkg/_fe_analyzer_shared/test/constants/data/map.dart
+10 -8
View File
@@ -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);
}
pkg/_fe_analyzer_shared/test/constants/data/set.dart
+9 -8
View File
@@ -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);
}
pkg/_fe_analyzer_shared/test/constants/data/type_literals.dart
+12 -8
View File
@@ -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);
pkg/front_end/lib/src/api_unstable/bazel_worker.dart
+2 -2
View File
@@ -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,
pkg/front_end/lib/src/api_unstable/modular_incremental_compilation.dart
+1 -1
View File
@@ -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 =
pkg/front_end/lib/src/testing/id_testing_helper.dart
+1 -1
View File
@@ -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].
///
pkg/front_end/test/lint_test.status
+1
View File
@@ -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
pkg/front_end/test/macros/application/data/tests/annotations.dart.expect
+2 -2
View File
@@ -24,8 +24,8 @@ constants {
#C5 = ann::AnnotationsMacro {object:#C1, additional:#C4}
#C6 = <dynamic>[]
#C7 = ann::AnnotationsMacro {object:#C6, additional:#C2}
#C8 = <core::int*>[#C1]
#C8 = <core::int>[#C1]
#C9 = ann::AnnotationsMacro {object:#C8, additional:#C2}
#C10 = <core::int*>[#C1, #C4]
#C10 = <core::int>[#C1, #C4]
#C11 = ann::AnnotationsMacro {object:#C10, additional:#C2}
}
pkg/front_end/test/macros/application/data/tests/import_conflict.dart.expect
+3 -3
View File
@@ -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<math::Random*>*)
#C4 = TypeLiteralConstant(con::JsonCodec*)
#C2 = TypeLiteralConstant(core::int)
#C3 = TypeLiteralConstant(FutureOr<math::Random>)
#C4 = TypeLiteralConstant(con::JsonCodec)
}
pkg/front_end/test/macros/application/data/tests/targets.dart.expect
+1 -1
View File
@@ -2019,5 +2019,5 @@ constants {
#C41 = 0
#C42 = "a"
#C43 = self::Enum {index:#C41, _name:#C42}
#C44 = <self::Enum*>[#C43]
#C44 = <self::Enum>[#C43]
}
pkg/front_end/test/macros/application/data/tests/unhandled_annotations.dart.expect
+4 -4
View File
@@ -123,7 +123,7 @@ constants {
#C5 = ann::AnnotationsMacro {object:#C4, additional:#C2}
#C6 = <dynamic, dynamic>{}
#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 <core::int*>
#C23 = instantiation #C22 <core::int>
#C24 = ann::AnnotationsMacro {object:#C23, additional:#C2}
#C25 = TypeLiteralConstant(self::Class*)
#C25 = TypeLiteralConstant(self::Class)
#C26 = ann::AnnotationsMacro {object:#C25, additional:#C2}
#C27 = 2
}