diff --git a/pkg/compiler/tool/kernel_visitor/test/info_visitor_test.dart b/pkg/compiler/tool/kernel_visitor/test/info_visitor_test.dart index 5fff2d34b93..e9d57ebc41e 100644 --- a/pkg/compiler/tool/kernel_visitor/test/info_visitor_test.dart +++ b/pkg/compiler/tool/kernel_visitor/test/info_visitor_test.dart @@ -87,7 +87,6 @@ void main() async { var result = await Process.run(Platform.resolvedExecutable, [ compilePath, "--target=dartdevc", - "--nnbd-strong", "--platform=${ddcOutlinePath}", "-o=${dillPath}", testClassesPath diff --git a/pkg/front_end/lib/src/api_prototype/compiler_options.dart b/pkg/front_end/lib/src/api_prototype/compiler_options.dart index c565895d682..a9806594790 100644 --- a/pkg/front_end/lib/src/api_prototype/compiler_options.dart +++ b/pkg/front_end/lib/src/api_prototype/compiler_options.dart @@ -258,7 +258,7 @@ class CompilerOptions { /// Whether nnbd weak, strong or agnostic mode is used if experiment /// 'non-nullable' is enabled. - NnbdMode nnbdMode = NnbdMode.Weak; + NnbdMode nnbdMode = NnbdMode.Strong; /// Whether to emit a warning when a ReachabilityError is thrown to ensure /// soundness in mixed mode. diff --git a/pkg/front_end/lib/src/base/nnbd_mode.dart b/pkg/front_end/lib/src/base/nnbd_mode.dart index 86366bef86f..ef19ae06124 100644 --- a/pkg/front_end/lib/src/base/nnbd_mode.dart +++ b/pkg/front_end/lib/src/base/nnbd_mode.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. enum NnbdMode { - Weak, Strong, + Weak, Agnostic, } diff --git a/pkg/front_end/messages.yaml b/pkg/front_end/messages.yaml index 252cc885c99..1b33bae3015 100644 --- a/pkg/front_end/messages.yaml +++ b/pkg/front_end/messages.yaml @@ -972,6 +972,7 @@ AbstractClassMember: problemMessage: "Members of classes can't be declared to be 'abstract'." correctionMessage: "Try removing the 'abstract' keyword. You can add the 'abstract' keyword before the class declaration." analyzerCode: ParserErrorCode.ABSTRACT_CLASS_MEMBER + configuration: nnbd-weak script: - | abstract class C {abstract C.c();} @@ -993,7 +994,6 @@ AbstractExternalField: problemMessage: "Fields can't be declared both 'abstract' and 'external'." analyzerCode: ParserErrorCode.ABSTRACT_EXTERNAL_FIELD correctionMessage: "Try removing the 'abstract' or 'external' keyword." - configuration: nnbd-strong script: - "abstract class C {abstract external var f;}" - "abstract class C {external abstract var f;}" @@ -1003,7 +1003,6 @@ AbstractStaticField: problemMessage: "Static fields can't be declared 'abstract'." analyzerCode: ParserErrorCode.ABSTRACT_STATIC_FIELD correctionMessage: "Try removing the 'abstract' or 'static' keyword." - configuration: nnbd-strong script: - "abstract class C {abstract static var f;}" @@ -1018,14 +1017,12 @@ AbstractExtensionField: AbstractFieldInitializer: problemMessage: "Abstract fields cannot have initializers." correctionMessage: "Try removing the initializer or the 'abstract' keyword." - configuration: nnbd-strong script: - "abstract class C {abstract var f = 0;}" AbstractFieldConstructorInitializer: problemMessage: "Abstract fields cannot have initializers." correctionMessage: "Try removing the field initializer or the 'abstract' keyword from the field declaration." - configuration: nnbd-strong script: - "abstract class C {abstract var f; C(this.f);}" - "abstract class C {abstract var f; C() : this.f = 0;}" @@ -1035,7 +1032,6 @@ AbstractLateField: problemMessage: "Abstract fields cannot be late." analyzerCode: ParserErrorCode.ABSTRACT_LATE_FIELD correctionMessage: "Try removing the 'abstract' or 'late' keyword." - configuration: nnbd-strong script: - "abstract class C {abstract late var f;}" @@ -1287,16 +1283,15 @@ ExternalField: problemMessage: "Fields can't be declared to be 'external'." correctionMessage: "Try removing the keyword 'external', or replacing the field by an external getter and/or setter." analyzerCode: ParserErrorCode.EXTERNAL_FIELD + configuration: nnbd-weak script: - | // @dart=2.9 class C { external var f; } - ExternalFieldInitializer: problemMessage: "External fields cannot have initializers." correctionMessage: "Try removing the initializer or the 'external' keyword." - configuration: nnbd-strong script: - "external var f = 0;" - "abstract class C {external var f = 0;}" @@ -1304,7 +1299,6 @@ ExternalFieldInitializer: ExternalFieldConstructorInitializer: problemMessage: "External fields cannot have initializers." correctionMessage: "Try removing the field initializer or the 'external' keyword from the field declaration." - configuration: nnbd-strong script: - "abstract class C {external var f; C(this.f);}" - "abstract class C {external var f; C() : this.f = 0;}" @@ -1314,7 +1308,6 @@ ExternalLateField: problemMessage: "External fields cannot be late." analyzerCode: ParserErrorCode.EXTERNAL_LATE_FIELD correctionMessage: "Try removing the 'external' or 'late' keyword." - configuration: nnbd-strong script: - "external late var f;" - "abstract class C {external late var f;}" @@ -1459,7 +1452,6 @@ FinalAndCovariantLateWithInitializer: correctionMessage: "Try removing either the 'final' or 'covariant' keyword, or removing the initializer." analyzerCode: ParserErrorCode.FINAL_AND_COVARIANT_LATE_WITH_INITIALIZER # Weak and strong doesn't matter in this instance. - configuration: nnbd-strong script: - "class C { covariant late final f = 5; }" @@ -2988,7 +2980,6 @@ OverrideTypeMismatchSetter: OverrideMismatchRequiredNamedParameter: problemMessage: "The required named parameter '#name' in method '#name2' is not required in overridden method '#name3'." - configuration: nnbd-strong script: | abstract class A { method({int? a}); @@ -2999,7 +2990,6 @@ OverrideMismatchRequiredNamedParameter: InvalidGetterSetterType: problemMessage: "The type '#type' of the getter '#name' is not a subtype of the type '#type2' of the setter '#name2'." - configuration: nnbd-strong script: | abstract class A { num get property; @@ -3008,7 +2998,6 @@ InvalidGetterSetterType: InvalidGetterSetterTypeGetterInherited: problemMessage: "The type '#type' of the inherited getter '#name' is not a subtype of the type '#type2' of the setter '#name2'." - configuration: nnbd-strong script: | abstract class A { num get property; @@ -3019,7 +3008,6 @@ InvalidGetterSetterTypeGetterInherited: InvalidGetterSetterTypeFieldInherited: problemMessage: "The type '#type' of the inherited field '#name' is not a subtype of the type '#type2' of the setter '#name2'." - configuration: nnbd-strong script: | abstract class A { final num property; @@ -3031,7 +3019,6 @@ InvalidGetterSetterTypeFieldInherited: InvalidGetterSetterTypeSetterInheritedGetter: problemMessage: "The type '#type' of the getter '#name' is not a subtype of the type '#type2' of the inherited setter '#name2'." - configuration: nnbd-strong script: | abstract class A { void set property(int i); @@ -3042,7 +3029,6 @@ InvalidGetterSetterTypeSetterInheritedGetter: InvalidGetterSetterTypeSetterInheritedField: problemMessage: "The type '#type' of the field '#name' is not a subtype of the type '#type2' of the inherited setter '#name2'." - configuration: nnbd-strong script: | abstract class A { void set property(int i); @@ -3054,7 +3040,6 @@ InvalidGetterSetterTypeSetterInheritedField: InvalidGetterSetterTypeBothInheritedField: problemMessage: "The type '#type' of the inherited field '#name' is not a subtype of the type '#type2' of the inherited setter '#name2'." - configuration: nnbd-strong script: | abstract class A { final num property; @@ -3067,7 +3052,6 @@ InvalidGetterSetterTypeBothInheritedField: InvalidGetterSetterTypeBothInheritedGetter: problemMessage: "The type '#type' of the inherited getter '#name' is not a subtype of the type '#type2' of the inherited setter '#name2'." - configuration: nnbd-strong script: | abstract class A { num get property; @@ -3079,6 +3063,7 @@ InvalidGetterSetterTypeBothInheritedGetter: InvalidGetterSetterTypeLegacy: problemMessage: "The type '#type' of the getter '#name' is not assignable to the type '#type2' of the setter '#name2'." + configuration: nnbd-weak script: | // @dart=2.9 abstract class A { @@ -3088,6 +3073,7 @@ InvalidGetterSetterTypeLegacy: InvalidGetterSetterTypeGetterInheritedLegacy: problemMessage: "The type '#type' of the inherited getter '#name' is not assignable to the type '#type2' of the setter '#name2'." + configuration: nnbd-weak script: | // @dart=2.9 abstract class A { @@ -3099,6 +3085,7 @@ InvalidGetterSetterTypeGetterInheritedLegacy: InvalidGetterSetterTypeFieldInheritedLegacy: problemMessage: "The type '#type' of the inherited field '#name' is not assignable to the type '#type2' of the setter '#name2'." + configuration: nnbd-weak script: | // @dart=2.9 abstract class A { @@ -3111,6 +3098,7 @@ InvalidGetterSetterTypeFieldInheritedLegacy: InvalidGetterSetterTypeSetterInheritedGetterLegacy: problemMessage: "The type '#type' of the getter '#name' is not assignable to the type '#type2' of the inherited setter '#name2'." + configuration: nnbd-weak script: | // @dart=2.9 abstract class A { @@ -3122,6 +3110,7 @@ InvalidGetterSetterTypeSetterInheritedGetterLegacy: InvalidGetterSetterTypeSetterInheritedFieldLegacy: problemMessage: "The type '#type' of the field '#name' is not assignable to the type '#type2' of the inherited setter '#name2'." + configuration: nnbd-weak script: | // @dart=2.9 abstract class A { @@ -3134,6 +3123,7 @@ InvalidGetterSetterTypeSetterInheritedFieldLegacy: InvalidGetterSetterTypeBothInheritedFieldLegacy: problemMessage: "The type '#type' of the inherited field '#name' is not assignable to the type '#type2' of the inherited setter '#name2'." + configuration: nnbd-weak script: | // @dart=2.9 abstract class A { @@ -3147,6 +3137,7 @@ InvalidGetterSetterTypeBothInheritedFieldLegacy: InvalidGetterSetterTypeBothInheritedGetterLegacy: problemMessage: "The type '#type' of the inherited getter '#name' is not assignable to the type '#type2' of the inherited setter '#name2'." + configuration: nnbd-weak script: | // @dart=2.9 abstract class A { @@ -3290,7 +3281,6 @@ TypedefTypeVariableNotConstructorCause: TypedefNullableType: problemMessage: "Can't create typedef from nullable type." - configuration: nnbd-strong script: | // @dart=2.12 typedef F = void Function()?; @@ -3778,6 +3768,7 @@ SuperAsExpression: SwitchExpressionNotAssignable: problemMessage: "Type '#type' of the switch expression isn't assignable to the type '#type2' of this case expression." analyzerCode: SWITCH_EXPRESSION_NOT_ASSIGNABLE + configuration: nnbd-weak script: - | // @dart=2.9 @@ -3793,6 +3784,7 @@ SwitchExpressionNotAssignableCause: SwitchExpressionNotSubtype: problemMessage: "Type '#type' of the case expression is not a subtype of type '#type2' of this switch expression." + configuration: nnbd-weak script: - | // @dart=2.19 @@ -4099,7 +4091,6 @@ ArgumentTypeNotAssignable: ArgumentTypeNotAssignableNullability: problemMessage: "The argument type '#type' can't be assigned to the parameter type '#type2' because '#type' is nullable and '#type2' isn't." analyzerCode: ARGUMENT_TYPE_NOT_ASSIGNABLE - configuration: nnbd-strong script: > method(int i) {} main() { @@ -4110,7 +4101,6 @@ ArgumentTypeNotAssignableNullability: ArgumentTypeNotAssignablePartNullability: problemMessage: "The argument type '#type' can't be assigned to the parameter type '#type2' because '#type3' is nullable and '#type4' isn't." analyzerCode: ARGUMENT_TYPE_NOT_ASSIGNABLE - configuration: nnbd-strong script: > method(List i) {} main() { @@ -4121,7 +4111,6 @@ ArgumentTypeNotAssignablePartNullability: ArgumentTypeNotAssignableNullabilityNull: problemMessage: "The value 'null' can't be assigned to the parameter type '#type' because '#type' is not nullable." analyzerCode: ARGUMENT_TYPE_NOT_ASSIGNABLE - configuration: nnbd-strong script: > method(int i) {} main() { @@ -4131,7 +4120,6 @@ ArgumentTypeNotAssignableNullabilityNull: ArgumentTypeNotAssignableNullabilityNullType: problemMessage: "The argument type '#type' can't be assigned to the parameter type '#type2' because '#type2' is not nullable." analyzerCode: ARGUMENT_TYPE_NOT_ASSIGNABLE - configuration: nnbd-strong script: > method(int i) {} main() { @@ -4151,7 +4139,6 @@ InvalidAssignmentError: InvalidAssignmentErrorNullability: problemMessage: "A value of type '#type' can't be assigned to a variable of type '#type2' because '#type' is nullable and '#type2' isn't." analyzerCode: INVALID_ASSIGNMENT - configuration: nnbd-strong script: > main() { int i = 0; @@ -4162,7 +4149,6 @@ InvalidAssignmentErrorNullability: InvalidAssignmentErrorPartNullability: problemMessage: "A value of type '#type' can't be assigned to a variable of type '#type2' because '#type3' is nullable and '#type4' isn't." analyzerCode: INVALID_ASSIGNMENT - configuration: nnbd-strong script: > main() { List i = []; @@ -4173,7 +4159,6 @@ InvalidAssignmentErrorPartNullability: InvalidAssignmentErrorNullabilityNull: problemMessage: "The value 'null' can't be assigned to a variable of type '#type' because '#type' is not nullable." analyzerCode: INVALID_ASSIGNMENT - configuration: nnbd-strong script: > main() { int i = 0; @@ -4183,7 +4168,6 @@ InvalidAssignmentErrorNullabilityNull: InvalidAssignmentErrorNullabilityNullType: problemMessage: "A value of type '#type' can't be assigned to a variable of type '#type2' because '#type2' is not nullable." analyzerCode: INVALID_ASSIGNMENT - configuration: nnbd-strong script: > main() { Null n; @@ -4395,7 +4379,6 @@ CantInferTypeDueToNoCombinedSignature: problemMessage: "Can't infer a type for '#name' as the overridden members don't have a combined signature." correctionMessage: "Try adding an explicit type." analyzerCode: COMPILE_TIME_ERROR.NO_COMBINED_SUPER_SIGNATURE - configuration: nnbd-strong script: | class A { void method(int a) {} @@ -4411,7 +4394,6 @@ CantInferReturnTypeDueToNoCombinedSignature: problemMessage: "Can't infer a return type for '#name' as the overridden members don't have a combined signature." correctionMessage: "Try adding an explicit type." analyzerCode: COMPILE_TIME_ERROR.NO_COMBINED_SUPER_SIGNATURE - configuration: nnbd-strong script: | abstract class A { int get getter; @@ -4482,7 +4464,6 @@ ForInLoopElementTypeNotAssignableNullability: problemMessage: "A value of type '#type' can't be assigned to a variable of type '#type2' because '#type' is nullable and '#type2' isn't." correctionMessage: "Try changing the type of the variable." analyzerCode: FOR_IN_OF_INVALID_ELEMENT_TYPE - configuration: nnbd-strong script: | method() { List list = []; @@ -4493,7 +4474,6 @@ ForInLoopElementTypeNotAssignablePartNullability: problemMessage: "A value of type '#type' can't be assigned to a variable of type '#type2' because '#type3' is nullable and '#type4' isn't." correctionMessage: "Try changing the type of the variable." analyzerCode: FOR_IN_OF_INVALID_ELEMENT_TYPE - configuration: nnbd-strong script: | method() { List> list = [[]]; @@ -4512,7 +4492,6 @@ ForInLoopTypeNotIterable: ForInLoopTypeNotIterableNullability: problemMessage: "The type '#type' used in the 'for' loop must implement '#type2' because '#type' is nullable and '#type2' isn't." analyzerCode: FOR_IN_OF_INVALID_TYPE - configuration: nnbd-strong script: | method() { List? list = null; @@ -4712,69 +4691,56 @@ ReturnFromVoidFunction: ReturnWithoutExpressionSync: problemMessage: "A value must be explicitly returned from a non-void function." - configuration: nnbd-strong script: | import "dart:async"; FutureOr foo() { return; } ReturnWithoutExpressionAsync: problemMessage: "A value must be explicitly returned from a non-void async function." - configuration: nnbd-strong declaration: "Future foo() async { return; }" InvalidReturn: problemMessage: "A value of type '#type' can't be returned from a function with return type '#type2'." - configuration: nnbd-strong declaration: "int foo() { return true; }" InvalidReturnNullability: problemMessage: "A value of type '#type' can't be returned from a function with return type '#type2' because '#type' is nullable and '#type2' isn't." - configuration: nnbd-strong declaration: "int foo(int? i) { return i; }" InvalidReturnPartNullability: problemMessage: "A value of type '#type' can't be returned from a function with return type '#type2' because '#type3' is nullable and '#type4' isn't." - configuration: nnbd-strong declaration: "List foo(List list) { return list; }" InvalidReturnNullabilityNull: problemMessage: "The value 'null' can't be returned from a function with return type '#type' because '#type' is not nullable." - configuration: nnbd-strong declaration: "int foo() { return null; }" InvalidReturnNullabilityNullType: problemMessage: "A value of type '#type' can't be returned from a function with return type '#type2' because '#type2' is not nullable." - configuration: nnbd-strong declaration: "int foo(Null i) { return i; }" InvalidReturnAsync: problemMessage: "A value of type '#type' can't be returned from an async function with return type '#type2'." - configuration: nnbd-strong declaration: "Future foo() async { return true; }" InvalidReturnAsyncNullability: problemMessage: "A value of type '#type' can't be returned from an async function with return type '#type2' because '#type' is nullable and '#type2' isn't." - configuration: nnbd-strong declaration: "Future foo(int? i) async { return i; }" InvalidReturnAsyncPartNullability: problemMessage: "A value of type '#type' can't be returned from an async function with return type '#type2' because '#type3' is nullable and '#type4' isn't." - configuration: nnbd-strong declaration: "Future> foo(List list) async { return list; }" InvalidReturnAsyncNullabilityNull: problemMessage: "The value 'null' can't be returned from an async function with return type '#type' because '#type' is not nullable." - configuration: nnbd-strong declaration: "Future foo() async { return null; }" InvalidReturnAsyncNullabilityNullType: problemMessage: "A value of type '#type' can't be returned from an async function with return type '#type2' because '#type2' is not nullable." - configuration: nnbd-strong declaration: "Future foo(Null n) async { return n; }" ImplicitReturnNull: problemMessage: "A non-null value must be returned since the return type '#type' doesn't allow null." - configuration: nnbd-strong script: | String method() {} @@ -4785,6 +4751,7 @@ RethrowNotCatch: InvokeNonFunction: problemMessage: "'#name' isn't a function or method and can't be invoked." analyzerCode: INVOCATION_OF_NON_FUNCTION + configuration: nnbd-weak script: | // @dart=2.9 class Foo { @@ -5328,7 +5295,6 @@ SpreadElementTypeMismatch: SpreadElementTypeMismatchNullability: problemMessage: "Can't assign spread elements of type '#type' to collection elements of type '#type2' because '#type' is nullable and '#type2' isn't." analyzerCode: LIST_ELEMENT_TYPE_NOT_ASSIGNABLE - configuration: nnbd-strong script: > main() { List a = [0, null]; @@ -5338,7 +5304,6 @@ SpreadElementTypeMismatchNullability: SpreadElementTypeMismatchPartNullability: problemMessage: "Can't assign spread elements of type '#type' to collection elements of type '#type2' because '#type3' is nullable and '#type4' isn't." analyzerCode: LIST_ELEMENT_TYPE_NOT_ASSIGNABLE - configuration: nnbd-strong script: > main() { List> a = >[[0, null]]; @@ -5371,7 +5336,6 @@ SpreadMapEntryElementKeyTypeMismatch: SpreadMapEntryElementKeyTypeMismatchNullability: problemMessage: "Can't assign spread entry keys of type '#type' to map entry keys of type '#type2' because '#type' is nullable and '#type2' isn't." analyzerCode: MAP_KEY_TYPE_NOT_ASSIGNABLE - configuration: nnbd-strong script: > main() { Map a = {"foo": 42, null: 87}; @@ -5381,7 +5345,6 @@ SpreadMapEntryElementKeyTypeMismatchNullability: SpreadMapEntryElementKeyTypeMismatchPartNullability: problemMessage: "Can't assign spread entry keys of type '#type' to map entry keys of type '#type2' because '#type3' is nullable and '#type4' isn't." analyzerCode: MAP_KEY_TYPE_NOT_ASSIGNABLE - configuration: nnbd-strong script: > main() { Map, int> a = , int>{["foo"]: 42, [null]: 87}; @@ -5400,7 +5363,6 @@ SpreadMapEntryElementValueTypeMismatch: SpreadMapEntryElementValueTypeMismatchNullability: problemMessage: "Can't assign spread entry values of type '#type' to map entry values of type '#type2' because '#type' is nullable and '#type2' isn't." analyzerCode: MAP_VALUE_TYPE_NOT_ASSIGNABLE - configuration: nnbd-strong script: > main() { Map a = {"foo": 42, "bar": null}; @@ -5410,7 +5372,6 @@ SpreadMapEntryElementValueTypeMismatchNullability: SpreadMapEntryElementValueTypeMismatchPartNullability: problemMessage: "Can't assign spread entry values of type '#type' to map entry values of type '#type2' because '#type3' is nullable and '#type4' isn't." analyzerCode: MAP_VALUE_TYPE_NOT_ASSIGNABLE - configuration: nnbd-strong script: > main() { Map> a = >{"foo": [42], "bar": [null]}; @@ -5540,11 +5501,11 @@ LanguageVersionMismatchInPart: problemMessage: "The language version override has to be the same in the library and its part(s)." script: main.dart: > - // @dart = 2.4 + // @dart = 2.13 part 'part.dart'; part.dart: > - // @dart = 2.3 + // @dart = 2.12 part of 'main.dart'; @@ -5751,7 +5712,6 @@ OptionalNonNullableWithoutInitializerError: problemMessage: "The parameter '#name' can't have a value of 'null' because of its type '#type', but the implicit default value is 'null'." correctionMessage: "Try adding either an explicit non-'null' default value or the 'required' modifier." analyzerCode: MISSING_DEFAULT_VALUE_FOR_PARAMETER - configuration: nnbd-strong script: - method1({int a}) {} - method2([int a]) {} @@ -6006,7 +5966,6 @@ JsInteropStaticInteropWithNonStaticSupertype: NonNullableNotAssignedError: problemMessage: "Non-nullable variable '#name' must be assigned before it can be used." - configuration: nnbd-strong script: | method() { T t; t; @@ -6015,7 +5974,6 @@ NonNullableNotAssignedError: FinalNotAssignedError: problemMessage: "Final variable '#name' must be assigned before it can be used." analyzerCode: READ_POTENTIALLY_UNASSIGNED_FINAL - configuration: nnbd-strong script: > method(bool b) { final int i; @@ -6027,7 +5985,6 @@ FinalNotAssignedError: LateDefinitelyUnassignedError: problemMessage: "Late variable '#name' without initializer is definitely unassigned." - configuration: nnbd-strong script: | method() { late T t; t; @@ -6035,7 +5992,6 @@ LateDefinitelyUnassignedError: LateDefinitelyAssignedError: problemMessage: "Late final variable '#name' definitely assigned." - configuration: nnbd-strong script: | method() { late final int t; @@ -6046,7 +6002,6 @@ LateDefinitelyAssignedError: FinalPossiblyAssignedError: problemMessage: "Final variable '#name' might already be assigned at this point." analyzerCode: ASSIGNMENT_TO_FINAL_LOCAL - configuration: nnbd-strong script: | method() { final int i; @@ -6135,13 +6090,11 @@ NeverValueError: MainNotFunctionDeclaration: problemMessage: "The 'main' declaration must be a function declaration." - configuration: nnbd-strong script: - var main; MainNotFunctionDeclarationExported: problemMessage: "The exported 'main' declaration must be a function declaration." - configuration: nnbd-strong exampleAllowMoreCodes: true script: main.dart: @@ -6151,13 +6104,11 @@ MainNotFunctionDeclarationExported: MainTooManyRequiredParameters: problemMessage: "The 'main' method must have at most 2 required parameters." - configuration: nnbd-strong script: - main(a, b, c) {} MainTooManyRequiredParametersExported: problemMessage: "The exported 'main' method must have at most 2 required parameters." - configuration: nnbd-strong exampleAllowMoreCodes: true script: main.dart: @@ -6167,13 +6118,11 @@ MainTooManyRequiredParametersExported: MainRequiredNamedParameters: problemMessage: "The 'main' method cannot have required named parameters." - configuration: nnbd-strong script: - main({required a}) {} MainRequiredNamedParametersExported: problemMessage: "The exported 'main' method cannot have required named parameters." - configuration: nnbd-strong exampleAllowMoreCodes: true script: main.dart: @@ -6183,13 +6132,11 @@ MainRequiredNamedParametersExported: MainWrongParameterType: problemMessage: "The type '#type' of the first parameter of the 'main' method is not a supertype of '#type2'." - configuration: nnbd-strong script: - main(Set args) {} MainWrongParameterTypeExported: problemMessage: "The type '#type' of the first parameter of the exported 'main' method is not a supertype of '#type2'." - configuration: nnbd-strong exampleAllowMoreCodes: true script: main.dart: diff --git a/pkg/front_end/test/enable_non_nullable/enable_non_nullable_test.dart b/pkg/front_end/test/enable_non_nullable/enable_non_nullable_test.dart index fc2e21b2550..35baabefb02 100644 --- a/pkg/front_end/test/enable_non_nullable/enable_non_nullable_test.dart +++ b/pkg/front_end/test/enable_non_nullable/enable_non_nullable_test.dart @@ -9,6 +9,7 @@ import 'package:front_end/src/api_prototype/compiler_options.dart'; import 'package:front_end/src/api_prototype/experimental_flags.dart'; import 'package:front_end/src/api_prototype/kernel_generator.dart'; import 'package:front_end/src/api_prototype/language_version.dart'; +import 'package:front_end/src/base/nnbd_mode.dart'; import 'package:front_end/src/compute_platform_binaries_location.dart'; import 'package:kernel/ast.dart'; @@ -62,6 +63,7 @@ Future test( required Version versionImpliesOptIn, required Version versionOptsInAllowed}) async { CompilerOptions options = new CompilerOptions(); + options.nnbdMode = NnbdMode.Weak; if (enableNonNullableByDefault) { // Pretend non-nullable is on by default. options.defaultExperimentFlagsForTesting = { diff --git a/pkg/front_end/test/fasta/expression_suite.dart b/pkg/front_end/test/fasta/expression_suite.dart index 32d4d1a5426..ad713817ff3 100644 --- a/pkg/front_end/test/fasta/expression_suite.dart +++ b/pkg/front_end/test/fasta/expression_suite.dart @@ -19,6 +19,7 @@ import "package:front_end/src/api_prototype/memory_file_system.dart" show MemoryFileSystem; import "package:front_end/src/api_prototype/terminal_color_support.dart" show printDiagnosticMessage; +import 'package:front_end/src/base/nnbd_mode.dart' show NnbdMode; import 'package:front_end/src/base/processed_options.dart' show ProcessedOptions; import 'package:front_end/src/compute_platform_binaries_location.dart' @@ -692,6 +693,8 @@ Future createContext( errors.add(message); } ..environmentDefines = const {} + // TODO(johnniwinther): We should default to strong mode. + ..nnbdMode = NnbdMode.Weak ..explicitExperimentalFlags = {} ..allowedExperimentalFlagsForTesting = const AllowedExperimentalFlags(); @@ -709,6 +712,7 @@ Future createContext( errors.add(message); } ..environmentDefines = const {} + ..nnbdMode = NnbdMode.Weak ..explicitExperimentalFlags = {ExperimentalFlag.nonNullable: false} ..allowedExperimentalFlagsForTesting = const AllowedExperimentalFlags(); diff --git a/pkg/front_end/test/fasta/incremental_dartino_suite.dart b/pkg/front_end/test/fasta/incremental_dartino_suite.dart index 9bba0d68019..3ed3e934baa 100644 --- a/pkg/front_end/test/fasta/incremental_dartino_suite.dart +++ b/pkg/front_end/test/fasta/incremental_dartino_suite.dart @@ -5,47 +5,34 @@ library fasta.test.incremental_test; import "dart:convert" show JsonEncoder; - import "dart:io" show File; import 'package:_fe_analyzer_shared/src/messages/severity.dart' show Severity; -import 'package:front_end/src/api_prototype/experimental_flags.dart'; - -import "package:kernel/ast.dart" show Component; - -import "package:testing/testing.dart" - show Chain, ChainContext, Result, Step, TestDescription; - -import "package:testing/src/log.dart" show splitLines; - -import "package:yaml/yaml.dart" show YamlMap, loadYamlNode; - import "package:front_end/src/api_prototype/compiler_options.dart" show CompilerOptions, DiagnosticMessage; - +import 'package:front_end/src/api_prototype/experimental_flags.dart'; import "package:front_end/src/api_prototype/incremental_kernel_generator.dart" show IncrementalKernelGenerator; - import "package:front_end/src/api_prototype/memory_file_system.dart" show MemoryFileSystem; - import "package:front_end/src/api_prototype/terminal_color_support.dart" show printDiagnosticMessage; - -import 'package:front_end/src/compute_platform_binaries_location.dart' - show computePlatformBinariesLocation; - +import 'package:front_end/src/base/nnbd_mode.dart' show NnbdMode; import 'package:front_end/src/base/processed_options.dart' show ProcessedOptions; - +import 'package:front_end/src/compute_platform_binaries_location.dart' + show computePlatformBinariesLocation; import 'package:front_end/src/fasta/compiler_context.dart' show CompilerContext; - import 'package:front_end/src/fasta/incremental_compiler.dart' show IncrementalCompiler; +import "package:kernel/ast.dart" show Component; +import "package:testing/src/log.dart" show splitLines; +import "package:testing/testing.dart" + show Chain, ChainContext, Result, Step, TestDescription; +import "package:yaml/yaml.dart" show YamlMap, loadYamlNode; import "incremental_expectations.dart" show IncrementalExpectation, extractJsonExpectations; - import "incremental_source_files.dart" show expandDiff, expandUpdates; import "suite_utils.dart"; @@ -231,6 +218,7 @@ Future createContext( ..fileSystem = fs ..sdkSummary = sdkSummary ..explicitExperimentalFlags = {ExperimentalFlag.nonNullable: false} + ..nnbdMode = NnbdMode.Weak ..onDiagnostic = (DiagnosticMessage message) { printDiagnosticMessage(message, print); if (message.severity == Severity.error) { diff --git a/pkg/front_end/test/src/base/processed_options_test.dart b/pkg/front_end/test/src/base/processed_options_test.dart index 588f9326901..406d36620fd 100644 --- a/pkg/front_end/test/src/base/processed_options_test.dart +++ b/pkg/front_end/test/src/base/processed_options_test.dart @@ -76,7 +76,7 @@ class ProcessedOptionsTest { fileUri: Uri.parse('org-dartlang-test:///a/b.dart')) ]) ..setMainMethodAndMode( - null, false, NonNullableByDefaultCompiledMode.Weak); + null, false, NonNullableByDefaultCompiledMode.Strong); void test_compileSdk_false() { for (var value in [false, true]) { diff --git a/pkg/front_end/test/test_generator_test.dart b/pkg/front_end/test/test_generator_test.dart index 569620a7b89..748e7a287a6 100644 --- a/pkg/front_end/test/test_generator_test.dart +++ b/pkg/front_end/test/test_generator_test.dart @@ -2,11 +2,12 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'dart:io' show exitCode, File, stdout; +import 'dart:io' show File, stdout; import 'package:front_end/src/api_prototype/compiler_options.dart'; import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart'; import 'package:front_end/src/api_prototype/memory_file_system.dart'; +import 'package:front_end/src/base/nnbd_mode.dart'; import 'package:front_end/src/compute_platform_binaries_location.dart'; import 'package:front_end/src/fasta/kernel/utils.dart'; import 'package:front_end/src/fasta/messages.dart'; @@ -57,7 +58,7 @@ Future main() async { print(source); print("----"); } - exitCode = 1; + throw "Errors found!"; } if (!hasNewline) print(""); } @@ -135,6 +136,7 @@ class TestCompiler { fs.entityForUri(sdkSummary).writeAsBytesSync(sdkSummaryData); CompilerOptions options = helper.getOptions(); + options.nnbdMode = NnbdMode.Weak; options.fileSystem = fs; options.sdkRoot = null; options.sdkSummary = sdkSummary; diff --git a/pkg/front_end/testcases/dart2js/js_interop_transforms/isa.dart.strong.transformed.expect b/pkg/front_end/testcases/dart2js/js_interop_transforms/isa.dart.strong.transformed.expect index b95578b38d5..3b2b5022c3a 100644 --- a/pkg/front_end/testcases/dart2js/js_interop_transforms/isa.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/dart2js/js_interop_transforms/isa.dart.strong.transformed.expect @@ -63,7 +63,7 @@ static method test(js_::JSAny /* erasure=dart.core::Object */ any) → void { !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "Object"); any == null || js_::JSAnyUtilityExtension|instanceOfString(any, "Object"); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "Array"); - !(any == null) && js_::JSAnyUtilityExtension|instanceof(any, js_2::JSObjectUnsafeUtilExtension|callMethodVarArgs(js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Object") as{ForLegacy} js_::JSObject /* erasure=_interceptors::JSObject */, js_::StringToJSString|get#toJS("getPrototypeOf"), [js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Int8Array") as{ForLegacy} js_::JSObject /* erasure=_interceptors::JSObject */])); + !(any == null) && js_::JSAnyUtilityExtension|instanceof(any, js_2::JSObjectUnsafeUtilExtension|callMethodVarArgs(js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Object") as js_::JSObject /* erasure=_interceptors::JSObject */, js_::StringToJSString|get#toJS("getPrototypeOf"), [js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Int8Array") as js_::JSObject /* erasure=_interceptors::JSObject */])); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "library1.CustomJSAny"); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "library1.CustomJSObject"); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "library1.CustomTypedArray"); diff --git a/pkg/front_end/testcases/dart2js/js_interop_transforms/isa.dart.weak.transformed.expect b/pkg/front_end/testcases/dart2js/js_interop_transforms/isa.dart.weak.transformed.expect index b95578b38d5..3b2b5022c3a 100644 --- a/pkg/front_end/testcases/dart2js/js_interop_transforms/isa.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/dart2js/js_interop_transforms/isa.dart.weak.transformed.expect @@ -63,7 +63,7 @@ static method test(js_::JSAny /* erasure=dart.core::Object */ any) → void { !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "Object"); any == null || js_::JSAnyUtilityExtension|instanceOfString(any, "Object"); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "Array"); - !(any == null) && js_::JSAnyUtilityExtension|instanceof(any, js_2::JSObjectUnsafeUtilExtension|callMethodVarArgs(js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Object") as{ForLegacy} js_::JSObject /* erasure=_interceptors::JSObject */, js_::StringToJSString|get#toJS("getPrototypeOf"), [js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Int8Array") as{ForLegacy} js_::JSObject /* erasure=_interceptors::JSObject */])); + !(any == null) && js_::JSAnyUtilityExtension|instanceof(any, js_2::JSObjectUnsafeUtilExtension|callMethodVarArgs(js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Object") as js_::JSObject /* erasure=_interceptors::JSObject */, js_::StringToJSString|get#toJS("getPrototypeOf"), [js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Int8Array") as js_::JSObject /* erasure=_interceptors::JSObject */])); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "library1.CustomJSAny"); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "library1.CustomJSObject"); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "library1.CustomTypedArray"); diff --git a/pkg/front_end/testcases/dart2wasm/for_in.dart.strong.transformed.expect b/pkg/front_end/testcases/dart2wasm/for_in.dart.strong.transformed.expect index e528a8d68d9..6aafc34e069 100644 --- a/pkg/front_end/testcases/dart2wasm/for_in.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/dart2wasm/for_in.dart.strong.transformed.expect @@ -28,7 +28,7 @@ static method asyncMethod(asy::Stream stream) → dynamic async /* em #L1: for (; ; ) { :async_temporary_0 = await #forIterator.{asy::_StreamIterator::moveNext}(){() → asy::Future}; - if(#jumpSentinel = :async_temporary_0 as{ForLegacy} dynamic) { + if(#jumpSentinel = :async_temporary_0 as dynamic) { core::int i = #forIterator.{asy::_StreamIterator::current}{core::int}; { core::print(i); diff --git a/pkg/front_end/testcases/dart2wasm/issue54069.dart.strong.transformed.expect b/pkg/front_end/testcases/dart2wasm/issue54069.dart.strong.transformed.expect index 38b6d28ece3..d5d60ca1fdc 100644 --- a/pkg/front_end/testcases/dart2wasm/issue54069.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/dart2wasm/issue54069.dart.strong.transformed.expect @@ -16,18 +16,18 @@ static method runBench([typ::Uint8List? data = #C1]) → void async /* emittedVa typ::Uint8List? :async_temporary_1; if(data == null) { :async_temporary_0 = await self::getBinaryTestProto(); - :async_temporary_1 = data = :async_temporary_0 as{ForLegacy} dynamic; + :async_temporary_1 = data = :async_temporary_0 as dynamic; } else { :async_temporary_1 = null; } - :async_temporary_1 as{ForLegacy} dynamic; + :async_temporary_1 as dynamic; core::print(data{typ::Uint8List}); } static method main() → void async /* emittedValueType= void */ { typ::Uint8List :async_temporary_0; :async_temporary_0 = await self::getBinaryTestProto(); - typ::Uint8List data = :async_temporary_0 as{ForLegacy} dynamic; + typ::Uint8List data = :async_temporary_0 as dynamic; core::print("File successfully read, contents: ${data}"); self::runBench(data); } diff --git a/pkg/front_end/testcases/dart2wasm/yield.dart.strong.transformed.expect b/pkg/front_end/testcases/dart2wasm/yield.dart.strong.transformed.expect index a3b77e3f1df..123755ac444 100644 --- a/pkg/front_end/testcases/dart2wasm/yield.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/dart2wasm/yield.dart.strong.transformed.expect @@ -35,7 +35,7 @@ static method asyncMethod(asy::Stream stream) → asy::Stream()).{asy::Completer::future}{asy::Future}; - :async_temporary_0 as{ForLegacy} dynamic; + :async_temporary_0 as dynamic; } if(#controller.{asy::StreamController::hasListener}{core::bool}) { } @@ -46,7 +46,7 @@ static method asyncMethod(asy::Stream stream) → asy::Stream()).{asy::Completer::future}{asy::Future}; - :async_temporary_1 as{ForLegacy} dynamic; + :async_temporary_1 as dynamic; } if(#controller.{asy::StreamController::hasListener}{core::bool}) { } diff --git a/pkg/front_end/testcases/dartdevc/js_interop_transforms/isa.dart.strong.transformed.expect b/pkg/front_end/testcases/dartdevc/js_interop_transforms/isa.dart.strong.transformed.expect index 843e56a65ee..b7402878b7e 100644 --- a/pkg/front_end/testcases/dartdevc/js_interop_transforms/isa.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/dartdevc/js_interop_transforms/isa.dart.strong.transformed.expect @@ -63,7 +63,7 @@ static method test(js_::JSAny /* erasure=dart.core::Object */ any) → void { !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "Object"); any == null || js_::JSAnyUtilityExtension|instanceOfString(any, "Object"); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "Array"); - !(any == null) && js_::JSAnyUtilityExtension|instanceof(any, js_2::JSObjectUnsafeUtilExtension|callMethodVarArgs(js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Object") as{ForLegacy} js_::JSObject /* erasure=dart._interceptors::JSObject */, js_::StringToJSString|get#toJS("getPrototypeOf"), [js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Int8Array") as{ForLegacy} js_::JSObject /* erasure=dart._interceptors::JSObject */])); + !(any == null) && js_::JSAnyUtilityExtension|instanceof(any, js_2::JSObjectUnsafeUtilExtension|callMethodVarArgs(js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Object") as js_::JSObject /* erasure=dart._interceptors::JSObject */, js_::StringToJSString|get#toJS("getPrototypeOf"), [js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Int8Array") as js_::JSObject /* erasure=dart._interceptors::JSObject */])); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "library1.CustomJSAny"); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "library1.CustomJSObject"); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "library1.CustomTypedArray"); diff --git a/pkg/front_end/testcases/dartdevc/js_interop_transforms/isa.dart.weak.transformed.expect b/pkg/front_end/testcases/dartdevc/js_interop_transforms/isa.dart.weak.transformed.expect index 843e56a65ee..b7402878b7e 100644 --- a/pkg/front_end/testcases/dartdevc/js_interop_transforms/isa.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/dartdevc/js_interop_transforms/isa.dart.weak.transformed.expect @@ -63,7 +63,7 @@ static method test(js_::JSAny /* erasure=dart.core::Object */ any) → void { !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "Object"); any == null || js_::JSAnyUtilityExtension|instanceOfString(any, "Object"); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "Array"); - !(any == null) && js_::JSAnyUtilityExtension|instanceof(any, js_2::JSObjectUnsafeUtilExtension|callMethodVarArgs(js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Object") as{ForLegacy} js_::JSObject /* erasure=dart._interceptors::JSObject */, js_::StringToJSString|get#toJS("getPrototypeOf"), [js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Int8Array") as{ForLegacy} js_::JSObject /* erasure=dart._interceptors::JSObject */])); + !(any == null) && js_::JSAnyUtilityExtension|instanceof(any, js_2::JSObjectUnsafeUtilExtension|callMethodVarArgs(js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Object") as js_::JSObject /* erasure=dart._interceptors::JSObject */, js_::StringToJSString|get#toJS("getPrototypeOf"), [js_2::JSObjectUnsafeUtilExtension|[](js_::globalContext, "Int8Array") as js_::JSObject /* erasure=dart._interceptors::JSObject */])); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "library1.CustomJSAny"); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "library1.CustomJSObject"); !(any == null) && js_::JSAnyUtilityExtension|instanceOfString(any, "library1.CustomTypedArray"); diff --git a/pkg/front_end/testcases/expression/nolib.expression.yaml.expect b/pkg/front_end/testcases/expression/nolib.expression.yaml.expect index c48fc3598a5..c46c67f2758 100644 --- a/pkg/front_end/testcases/expression/nolib.expression.yaml.expect +++ b/pkg/front_end/testcases/expression/nolib.expression.yaml.expect @@ -1,4 +1,4 @@ Errors: { } -method /*isNonNullableByDefault, from org-dartlang-debug:synthetic_debug_expression */ debugExpr() → dynamic +method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr() → dynamic return 0; diff --git a/pkg/front_end/testcases/general/ambiguous_exports.dart.strong.expect b/pkg/front_end/testcases/general/ambiguous_exports.dart.strong.expect index d10cce1d1b8..8155e8e3d5d 100644 --- a/pkg/front_end/testcases/general/ambiguous_exports.dart.strong.expect +++ b/pkg/front_end/testcases/general/ambiguous_exports.dart.strong.expect @@ -12,7 +12,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///hello.dart" show main; export "org-dartlang-testcase:///map.dart" show main; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self2; diff --git a/pkg/front_end/testcases/general/ambiguous_exports.dart.strong.transformed.expect b/pkg/front_end/testcases/general/ambiguous_exports.dart.strong.transformed.expect index d10cce1d1b8..8155e8e3d5d 100644 --- a/pkg/front_end/testcases/general/ambiguous_exports.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/general/ambiguous_exports.dart.strong.transformed.expect @@ -12,7 +12,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///hello.dart" show main; export "org-dartlang-testcase:///map.dart" show main; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self2; diff --git a/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.expect b/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.expect index d10cce1d1b8..8155e8e3d5d 100644 --- a/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.expect +++ b/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.expect @@ -12,7 +12,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///hello.dart" show main; export "org-dartlang-testcase:///map.dart" show main; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self2; diff --git a/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.modular.expect b/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.modular.expect index d10cce1d1b8..8155e8e3d5d 100644 --- a/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.modular.expect +++ b/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.modular.expect @@ -12,7 +12,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///hello.dart" show main; export "org-dartlang-testcase:///map.dart" show main; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self2; diff --git a/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.outline.expect b/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.outline.expect index 5b7e01fcd49..8f8c65a2047 100644 --- a/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.outline.expect +++ b/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.outline.expect @@ -11,7 +11,7 @@ import self as self; export "org-dartlang-testcase:///hello.dart" show main; export "org-dartlang-testcase:///map.dart" show main; -static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/general/hello.dart' and 'pkg/front_end/testcases/general/map.dart'.\"}" /*isLegacy*/; +static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/general/hello.dart' and 'pkg/front_end/testcases/general/map.dart'.\"}"; library; import self as self2; diff --git a/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.transformed.expect b/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.transformed.expect index d10cce1d1b8..8155e8e3d5d 100644 --- a/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/general/ambiguous_exports.dart.weak.transformed.expect @@ -12,7 +12,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///hello.dart" show main; export "org-dartlang-testcase:///map.dart" show main; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self2; diff --git a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.strong.expect b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.strong.expect index 66dee1bafbe..6638e352c29 100644 --- a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.strong.expect +++ b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.strong.expect @@ -179,7 +179,7 @@ export "dart:core"; export "org-dartlang-testcase:///main_lib2.dart"; export "org-dartlang-testcase:///main_lib3.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self3; diff --git a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.strong.transformed.expect b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.strong.transformed.expect index d8c76c7fbed..bd223d62dfb 100644 --- a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.strong.transformed.expect @@ -175,7 +175,7 @@ export "dart:core"; export "org-dartlang-testcase:///main_lib2.dart"; export "org-dartlang-testcase:///main_lib3.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self3; diff --git a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.expect b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.expect index 66dee1bafbe..6638e352c29 100644 --- a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.expect +++ b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.expect @@ -179,7 +179,7 @@ export "dart:core"; export "org-dartlang-testcase:///main_lib2.dart"; export "org-dartlang-testcase:///main_lib3.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self3; diff --git a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.outline.expect b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.outline.expect index 83784df03e5..3a966062e73 100644 --- a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.outline.expect +++ b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.outline.expect @@ -114,7 +114,7 @@ export "dart:core"; export "org-dartlang-testcase:///main_lib2.dart"; export "org-dartlang-testcase:///main_lib3.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self3; diff --git a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.transformed.expect b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.transformed.expect index d8c76c7fbed..bd223d62dfb 100644 --- a/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/general/error_export_from_dill/main.dart.weak.transformed.expect @@ -175,7 +175,7 @@ export "dart:core"; export "org-dartlang-testcase:///main_lib2.dart"; export "org-dartlang-testcase:///main_lib3.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self3; diff --git a/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.strong.expect b/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.strong.expect index 50a51b1d153..9155159c332 100644 --- a/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.strong.expect +++ b/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.strong.expect @@ -75,7 +75,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///main_lib2.dart"; export "org-dartlang-testcase:///main_lib3.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; // diff --git a/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.strong.transformed.expect b/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.strong.transformed.expect index 04a3955a697..eb3c230a21a 100644 --- a/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.strong.transformed.expect @@ -69,7 +69,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///main_lib2.dart"; export "org-dartlang-testcase:///main_lib3.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; // diff --git a/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.weak.expect b/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.weak.expect index 50a51b1d153..9155159c332 100644 --- a/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.weak.expect +++ b/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.weak.expect @@ -75,7 +75,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///main_lib2.dart"; export "org-dartlang-testcase:///main_lib3.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; // diff --git a/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.weak.outline.expect b/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.weak.outline.expect index 54faaf4bd77..8f2621673f7 100644 --- a/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.weak.outline.expect +++ b/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.weak.outline.expect @@ -34,7 +34,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///main_lib2.dart"; export "org-dartlang-testcase:///main_lib3.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; // diff --git a/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.weak.transformed.expect b/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.weak.transformed.expect index 04a3955a697..eb3c230a21a 100644 --- a/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/general/export_builtin_from_dill/main.dart.weak.transformed.expect @@ -69,7 +69,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///main_lib2.dart"; export "org-dartlang-testcase:///main_lib3.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; // diff --git a/pkg/front_end/testcases/general/forwarding_semi_stub.dart.strong.expect b/pkg/front_end/testcases/general/forwarding_semi_stub.dart.strong.expect index 5bb64637c48..3e83ff7b8ad 100644 --- a/pkg/front_end/testcases/general/forwarding_semi_stub.dart.strong.expect +++ b/pkg/front_end/testcases/general/forwarding_semi_stub.dart.strong.expect @@ -59,17 +59,17 @@ abstract class Class extends self::Super) → void */ setter4(covariant-by-declaration covariant-by-class core::Iterable a) → void return super.{self::Super::setter4} = a; forwarding-stub method method1(covariant-by-declaration core::num a) → void - return super.{self::Super::method1}(a as{ForLegacy} core::int); + return super.{self::Super::method1}(a as core::int); forwarding-stub method method2({covariant-by-declaration core::num? a = #C1}) → void - return super.{self::Super::method2}(a: a as{ForLegacy} core::int?); + return super.{self::Super::method2}(a: a as core::int?); forwarding-stub method method7(covariant-by-declaration covariant-by-class core::Iterable a) → void - return super.{self::Super::method7}(a as{ForLegacy} core::List); + return super.{self::Super::method7}(a as core::List); forwarding-stub method method8({covariant-by-declaration covariant-by-class core::Iterable? a = #C1}) → void - return super.{self::Super::method8}(a: a as{ForLegacy} core::List?); + return super.{self::Super::method8}(a: a as core::List?); forwarding-stub set setter1(covariant-by-declaration core::num a) → void - return super.{self::Super::setter1} = a as{ForLegacy} core::int; + return super.{self::Super::setter1} = a as core::int; forwarding-stub set setter3(covariant-by-declaration covariant-by-class core::Iterable a) → void - return super.{self::Super::setter3} = a as{ForLegacy} core::List; + return super.{self::Super::setter3} = a as core::List; } class Subclass extends self::Class { synthetic constructor •() → self::Subclass diff --git a/pkg/front_end/testcases/general/forwarding_semi_stub.dart.strong.transformed.expect b/pkg/front_end/testcases/general/forwarding_semi_stub.dart.strong.transformed.expect index 5bb64637c48..3e83ff7b8ad 100644 --- a/pkg/front_end/testcases/general/forwarding_semi_stub.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/general/forwarding_semi_stub.dart.strong.transformed.expect @@ -59,17 +59,17 @@ abstract class Class extends self::Super) → void */ setter4(covariant-by-declaration covariant-by-class core::Iterable a) → void return super.{self::Super::setter4} = a; forwarding-stub method method1(covariant-by-declaration core::num a) → void - return super.{self::Super::method1}(a as{ForLegacy} core::int); + return super.{self::Super::method1}(a as core::int); forwarding-stub method method2({covariant-by-declaration core::num? a = #C1}) → void - return super.{self::Super::method2}(a: a as{ForLegacy} core::int?); + return super.{self::Super::method2}(a: a as core::int?); forwarding-stub method method7(covariant-by-declaration covariant-by-class core::Iterable a) → void - return super.{self::Super::method7}(a as{ForLegacy} core::List); + return super.{self::Super::method7}(a as core::List); forwarding-stub method method8({covariant-by-declaration covariant-by-class core::Iterable? a = #C1}) → void - return super.{self::Super::method8}(a: a as{ForLegacy} core::List?); + return super.{self::Super::method8}(a: a as core::List?); forwarding-stub set setter1(covariant-by-declaration core::num a) → void - return super.{self::Super::setter1} = a as{ForLegacy} core::int; + return super.{self::Super::setter1} = a as core::int; forwarding-stub set setter3(covariant-by-declaration covariant-by-class core::Iterable a) → void - return super.{self::Super::setter3} = a as{ForLegacy} core::List; + return super.{self::Super::setter3} = a as core::List; } class Subclass extends self::Class { synthetic constructor •() → self::Subclass diff --git a/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.expect b/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.expect index 5bb64637c48..3e83ff7b8ad 100644 --- a/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.expect +++ b/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.expect @@ -59,17 +59,17 @@ abstract class Class extends self::Super) → void */ setter4(covariant-by-declaration covariant-by-class core::Iterable a) → void return super.{self::Super::setter4} = a; forwarding-stub method method1(covariant-by-declaration core::num a) → void - return super.{self::Super::method1}(a as{ForLegacy} core::int); + return super.{self::Super::method1}(a as core::int); forwarding-stub method method2({covariant-by-declaration core::num? a = #C1}) → void - return super.{self::Super::method2}(a: a as{ForLegacy} core::int?); + return super.{self::Super::method2}(a: a as core::int?); forwarding-stub method method7(covariant-by-declaration covariant-by-class core::Iterable a) → void - return super.{self::Super::method7}(a as{ForLegacy} core::List); + return super.{self::Super::method7}(a as core::List); forwarding-stub method method8({covariant-by-declaration covariant-by-class core::Iterable? a = #C1}) → void - return super.{self::Super::method8}(a: a as{ForLegacy} core::List?); + return super.{self::Super::method8}(a: a as core::List?); forwarding-stub set setter1(covariant-by-declaration core::num a) → void - return super.{self::Super::setter1} = a as{ForLegacy} core::int; + return super.{self::Super::setter1} = a as core::int; forwarding-stub set setter3(covariant-by-declaration covariant-by-class core::Iterable a) → void - return super.{self::Super::setter3} = a as{ForLegacy} core::List; + return super.{self::Super::setter3} = a as core::List; } class Subclass extends self::Class { synthetic constructor •() → self::Subclass diff --git a/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.modular.expect b/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.modular.expect index 5bb64637c48..3e83ff7b8ad 100644 --- a/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.modular.expect +++ b/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.modular.expect @@ -59,17 +59,17 @@ abstract class Class extends self::Super) → void */ setter4(covariant-by-declaration covariant-by-class core::Iterable a) → void return super.{self::Super::setter4} = a; forwarding-stub method method1(covariant-by-declaration core::num a) → void - return super.{self::Super::method1}(a as{ForLegacy} core::int); + return super.{self::Super::method1}(a as core::int); forwarding-stub method method2({covariant-by-declaration core::num? a = #C1}) → void - return super.{self::Super::method2}(a: a as{ForLegacy} core::int?); + return super.{self::Super::method2}(a: a as core::int?); forwarding-stub method method7(covariant-by-declaration covariant-by-class core::Iterable a) → void - return super.{self::Super::method7}(a as{ForLegacy} core::List); + return super.{self::Super::method7}(a as core::List); forwarding-stub method method8({covariant-by-declaration covariant-by-class core::Iterable? a = #C1}) → void - return super.{self::Super::method8}(a: a as{ForLegacy} core::List?); + return super.{self::Super::method8}(a: a as core::List?); forwarding-stub set setter1(covariant-by-declaration core::num a) → void - return super.{self::Super::setter1} = a as{ForLegacy} core::int; + return super.{self::Super::setter1} = a as core::int; forwarding-stub set setter3(covariant-by-declaration covariant-by-class core::Iterable a) → void - return super.{self::Super::setter3} = a as{ForLegacy} core::List; + return super.{self::Super::setter3} = a as core::List; } class Subclass extends self::Class { synthetic constructor •() → self::Subclass diff --git a/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.outline.expect b/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.outline.expect index 4ca142a4788..03e8910fa72 100644 --- a/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.outline.expect +++ b/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.outline.expect @@ -78,17 +78,17 @@ abstract class Class extends self::Super) → void */ setter4(covariant-by-declaration covariant-by-class core::Iterable a) → void return super.{self::Super::setter4} = a; forwarding-stub method method1(covariant-by-declaration core::num a) → void - return super.{self::Super::method1}(a as{ForLegacy} core::int); + return super.{self::Super::method1}(a as core::int); forwarding-stub method method2({covariant-by-declaration core::num? a}) → void - return super.{self::Super::method2}(a: a as{ForLegacy} core::int?); + return super.{self::Super::method2}(a: a as core::int?); forwarding-stub method method7(covariant-by-declaration covariant-by-class core::Iterable a) → void - return super.{self::Super::method7}(a as{ForLegacy} core::List); + return super.{self::Super::method7}(a as core::List); forwarding-stub method method8({covariant-by-declaration covariant-by-class core::Iterable? a}) → void - return super.{self::Super::method8}(a: a as{ForLegacy} core::List?); + return super.{self::Super::method8}(a: a as core::List?); forwarding-stub set setter1(covariant-by-declaration core::num a) → void - return super.{self::Super::setter1} = a as{ForLegacy} core::int; + return super.{self::Super::setter1} = a as core::int; forwarding-stub set setter3(covariant-by-declaration covariant-by-class core::Iterable a) → void - return super.{self::Super::setter3} = a as{ForLegacy} core::List; + return super.{self::Super::setter3} = a as core::List; } class Subclass extends self::Class { synthetic constructor •() → self::Subclass diff --git a/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.transformed.expect b/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.transformed.expect index 5bb64637c48..3e83ff7b8ad 100644 --- a/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/general/forwarding_semi_stub.dart.weak.transformed.expect @@ -59,17 +59,17 @@ abstract class Class extends self::Super) → void */ setter4(covariant-by-declaration covariant-by-class core::Iterable a) → void return super.{self::Super::setter4} = a; forwarding-stub method method1(covariant-by-declaration core::num a) → void - return super.{self::Super::method1}(a as{ForLegacy} core::int); + return super.{self::Super::method1}(a as core::int); forwarding-stub method method2({covariant-by-declaration core::num? a = #C1}) → void - return super.{self::Super::method2}(a: a as{ForLegacy} core::int?); + return super.{self::Super::method2}(a: a as core::int?); forwarding-stub method method7(covariant-by-declaration covariant-by-class core::Iterable a) → void - return super.{self::Super::method7}(a as{ForLegacy} core::List); + return super.{self::Super::method7}(a as core::List); forwarding-stub method method8({covariant-by-declaration covariant-by-class core::Iterable? a = #C1}) → void - return super.{self::Super::method8}(a: a as{ForLegacy} core::List?); + return super.{self::Super::method8}(a: a as core::List?); forwarding-stub set setter1(covariant-by-declaration core::num a) → void - return super.{self::Super::setter1} = a as{ForLegacy} core::int; + return super.{self::Super::setter1} = a as core::int; forwarding-stub set setter3(covariant-by-declaration covariant-by-class core::Iterable a) → void - return super.{self::Super::setter3} = a as{ForLegacy} core::List; + return super.{self::Super::setter3} = a as core::List; } class Subclass extends self::Class { synthetic constructor •() → self::Subclass diff --git a/pkg/front_end/testcases/general/issue46389.dart.strong.expect b/pkg/front_end/testcases/general/issue46389.dart.strong.expect index 74cfed842a0..b15f2a206cb 100644 --- a/pkg/front_end/testcases/general/issue46389.dart.strong.expect +++ b/pkg/front_end/testcases/general/issue46389.dart.strong.expect @@ -30,13 +30,13 @@ abstract class _C&A&B = self::A with self::B /*isAnonymousMixin*/ { : super self::A::•() ; forwarding-stub set boz(covariant-by-class core::num x) → void - return super.{self::A::boz} = x as{ForLegacy} core::int; + return super.{self::A::boz} = x as core::int; forwarding-stub method foo(covariant-by-class core::num x) → core::num - return super.{self::A::foo}(x as{ForLegacy} core::int); + return super.{self::A::foo}(x as core::int); forwarding-stub method bar({required covariant-by-class core::num x}) → core::num - return super.{self::A::bar}(x: x as{ForLegacy} core::int); + return super.{self::A::bar}(x: x as core::int); forwarding-stub set baz(covariant-by-class core::num x) → void - return super.{self::A::baz} = x as{ForLegacy} core::int; + return super.{self::A::baz} = x as core::int; } class C extends self::_C&A&B { synthetic constructor •() → self::C diff --git a/pkg/front_end/testcases/general/issue46389.dart.strong.transformed.expect b/pkg/front_end/testcases/general/issue46389.dart.strong.transformed.expect index b372ad3c744..9cd33b0c81f 100644 --- a/pkg/front_end/testcases/general/issue46389.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/general/issue46389.dart.strong.transformed.expect @@ -30,13 +30,13 @@ abstract class _C&A&B extends self::A implements self::B /*isAnonymou : super self::A::•() ; set boz(covariant-by-class core::num x) → void - return super.{self::A::boz} = x as{ForLegacy} core::int; + return super.{self::A::boz} = x as core::int; method foo(covariant-by-class core::num x) → core::num - return super.{self::A::foo}(x as{ForLegacy} core::int); + return super.{self::A::foo}(x as core::int); method bar({required covariant-by-class core::num x}) → core::num - return super.{self::A::bar}(x: x as{ForLegacy} core::int); + return super.{self::A::bar}(x: x as core::int); set baz(covariant-by-class core::num x) → void - return super.{self::A::baz} = x as{ForLegacy} core::int; + return super.{self::A::baz} = x as core::int; } class C extends self::_C&A&B { synthetic constructor •() → self::C diff --git a/pkg/front_end/testcases/general/issue46389.dart.weak.expect b/pkg/front_end/testcases/general/issue46389.dart.weak.expect index 74cfed842a0..b15f2a206cb 100644 --- a/pkg/front_end/testcases/general/issue46389.dart.weak.expect +++ b/pkg/front_end/testcases/general/issue46389.dart.weak.expect @@ -30,13 +30,13 @@ abstract class _C&A&B = self::A with self::B /*isAnonymousMixin*/ { : super self::A::•() ; forwarding-stub set boz(covariant-by-class core::num x) → void - return super.{self::A::boz} = x as{ForLegacy} core::int; + return super.{self::A::boz} = x as core::int; forwarding-stub method foo(covariant-by-class core::num x) → core::num - return super.{self::A::foo}(x as{ForLegacy} core::int); + return super.{self::A::foo}(x as core::int); forwarding-stub method bar({required covariant-by-class core::num x}) → core::num - return super.{self::A::bar}(x: x as{ForLegacy} core::int); + return super.{self::A::bar}(x: x as core::int); forwarding-stub set baz(covariant-by-class core::num x) → void - return super.{self::A::baz} = x as{ForLegacy} core::int; + return super.{self::A::baz} = x as core::int; } class C extends self::_C&A&B { synthetic constructor •() → self::C diff --git a/pkg/front_end/testcases/general/issue46389.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue46389.dart.weak.modular.expect index 74cfed842a0..b15f2a206cb 100644 --- a/pkg/front_end/testcases/general/issue46389.dart.weak.modular.expect +++ b/pkg/front_end/testcases/general/issue46389.dart.weak.modular.expect @@ -30,13 +30,13 @@ abstract class _C&A&B = self::A with self::B /*isAnonymousMixin*/ { : super self::A::•() ; forwarding-stub set boz(covariant-by-class core::num x) → void - return super.{self::A::boz} = x as{ForLegacy} core::int; + return super.{self::A::boz} = x as core::int; forwarding-stub method foo(covariant-by-class core::num x) → core::num - return super.{self::A::foo}(x as{ForLegacy} core::int); + return super.{self::A::foo}(x as core::int); forwarding-stub method bar({required covariant-by-class core::num x}) → core::num - return super.{self::A::bar}(x: x as{ForLegacy} core::int); + return super.{self::A::bar}(x: x as core::int); forwarding-stub set baz(covariant-by-class core::num x) → void - return super.{self::A::baz} = x as{ForLegacy} core::int; + return super.{self::A::baz} = x as core::int; } class C extends self::_C&A&B { synthetic constructor •() → self::C diff --git a/pkg/front_end/testcases/general/issue46389.dart.weak.outline.expect b/pkg/front_end/testcases/general/issue46389.dart.weak.outline.expect index 435b371c095..fdaa43fd608 100644 --- a/pkg/front_end/testcases/general/issue46389.dart.weak.outline.expect +++ b/pkg/front_end/testcases/general/issue46389.dart.weak.outline.expect @@ -24,13 +24,13 @@ abstract class _C&A&B = self::A with self::B /*isAnonymousMixin*/ { : super self::A::•() ; forwarding-stub set boz(covariant-by-class core::num x) → void - return super.{self::A::boz} = x as{ForLegacy} core::int; + return super.{self::A::boz} = x as core::int; forwarding-stub method foo(covariant-by-class core::num x) → core::num - return super.{self::A::foo}(x as{ForLegacy} core::int); + return super.{self::A::foo}(x as core::int); forwarding-stub method bar({required covariant-by-class core::num x}) → core::num - return super.{self::A::bar}(x: x as{ForLegacy} core::int); + return super.{self::A::bar}(x: x as core::int); forwarding-stub set baz(covariant-by-class core::num x) → void - return super.{self::A::baz} = x as{ForLegacy} core::int; + return super.{self::A::baz} = x as core::int; } class C extends self::_C&A&B { synthetic constructor •() → self::C diff --git a/pkg/front_end/testcases/general/issue46389.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue46389.dart.weak.transformed.expect index b372ad3c744..9cd33b0c81f 100644 --- a/pkg/front_end/testcases/general/issue46389.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/general/issue46389.dart.weak.transformed.expect @@ -30,13 +30,13 @@ abstract class _C&A&B extends self::A implements self::B /*isAnonymou : super self::A::•() ; set boz(covariant-by-class core::num x) → void - return super.{self::A::boz} = x as{ForLegacy} core::int; + return super.{self::A::boz} = x as core::int; method foo(covariant-by-class core::num x) → core::num - return super.{self::A::foo}(x as{ForLegacy} core::int); + return super.{self::A::foo}(x as core::int); method bar({required covariant-by-class core::num x}) → core::num - return super.{self::A::bar}(x: x as{ForLegacy} core::int); + return super.{self::A::bar}(x: x as core::int); set baz(covariant-by-class core::num x) → void - return super.{self::A::baz} = x as{ForLegacy} core::int; + return super.{self::A::baz} = x as core::int; } class C extends self::_C&A&B { synthetic constructor •() → self::C diff --git a/pkg/front_end/testcases/general/issue47013.dart.strong.expect b/pkg/front_end/testcases/general/issue47013.dart.strong.expect index 11daefc48b0..9c29ea58a71 100644 --- a/pkg/front_end/testcases/general/issue47013.dart.strong.expect +++ b/pkg/front_end/testcases/general/issue47013.dart.strong.expect @@ -19,7 +19,7 @@ class C extends self::A implements self::I { : super self::A::•() ; forwarding-stub method m(covariant-by-declaration core::num n) → void - return super.{self::A::m}(n as{ForLegacy} core::int); + return super.{self::A::m}(n as core::int); } static method main() → void { self::throws(() → void => (new self::C::•() as dynamic){dynamic}.m(1.1)); diff --git a/pkg/front_end/testcases/general/issue47013.dart.strong.transformed.expect b/pkg/front_end/testcases/general/issue47013.dart.strong.transformed.expect index 11daefc48b0..9c29ea58a71 100644 --- a/pkg/front_end/testcases/general/issue47013.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/general/issue47013.dart.strong.transformed.expect @@ -19,7 +19,7 @@ class C extends self::A implements self::I { : super self::A::•() ; forwarding-stub method m(covariant-by-declaration core::num n) → void - return super.{self::A::m}(n as{ForLegacy} core::int); + return super.{self::A::m}(n as core::int); } static method main() → void { self::throws(() → void => (new self::C::•() as dynamic){dynamic}.m(1.1)); diff --git a/pkg/front_end/testcases/general/issue47013.dart.weak.expect b/pkg/front_end/testcases/general/issue47013.dart.weak.expect index 11daefc48b0..9c29ea58a71 100644 --- a/pkg/front_end/testcases/general/issue47013.dart.weak.expect +++ b/pkg/front_end/testcases/general/issue47013.dart.weak.expect @@ -19,7 +19,7 @@ class C extends self::A implements self::I { : super self::A::•() ; forwarding-stub method m(covariant-by-declaration core::num n) → void - return super.{self::A::m}(n as{ForLegacy} core::int); + return super.{self::A::m}(n as core::int); } static method main() → void { self::throws(() → void => (new self::C::•() as dynamic){dynamic}.m(1.1)); diff --git a/pkg/front_end/testcases/general/issue47013.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue47013.dart.weak.modular.expect index 11daefc48b0..9c29ea58a71 100644 --- a/pkg/front_end/testcases/general/issue47013.dart.weak.modular.expect +++ b/pkg/front_end/testcases/general/issue47013.dart.weak.modular.expect @@ -19,7 +19,7 @@ class C extends self::A implements self::I { : super self::A::•() ; forwarding-stub method m(covariant-by-declaration core::num n) → void - return super.{self::A::m}(n as{ForLegacy} core::int); + return super.{self::A::m}(n as core::int); } static method main() → void { self::throws(() → void => (new self::C::•() as dynamic){dynamic}.m(1.1)); diff --git a/pkg/front_end/testcases/general/issue47013.dart.weak.outline.expect b/pkg/front_end/testcases/general/issue47013.dart.weak.outline.expect index d7fc5ba7b73..57d36b71cf3 100644 --- a/pkg/front_end/testcases/general/issue47013.dart.weak.outline.expect +++ b/pkg/front_end/testcases/general/issue47013.dart.weak.outline.expect @@ -17,7 +17,7 @@ class C extends self::A implements self::I { synthetic constructor •() → self::C ; forwarding-stub method m(covariant-by-declaration core::num n) → void - return super.{self::A::m}(n as{ForLegacy} core::int); + return super.{self::A::m}(n as core::int); } static method main() → void ; diff --git a/pkg/front_end/testcases/general/issue47013.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue47013.dart.weak.transformed.expect index 11daefc48b0..9c29ea58a71 100644 --- a/pkg/front_end/testcases/general/issue47013.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/general/issue47013.dart.weak.transformed.expect @@ -19,7 +19,7 @@ class C extends self::A implements self::I { : super self::A::•() ; forwarding-stub method m(covariant-by-declaration core::num n) → void - return super.{self::A::m}(n as{ForLegacy} core::int); + return super.{self::A::m}(n as core::int); } static method main() → void { self::throws(() → void => (new self::C::•() as dynamic){dynamic}.m(1.1)); diff --git a/pkg/front_end/testcases/general/issue47072.dart.strong.expect b/pkg/front_end/testcases/general/issue47072.dart.strong.expect index d30831c3c4b..d4533e695c1 100644 --- a/pkg/front_end/testcases/general/issue47072.dart.strong.expect +++ b/pkg/front_end/testcases/general/issue47072.dart.strong.expect @@ -29,7 +29,7 @@ class D extends self::C implements self::I { : super self::C::•() ; forwarding-stub method f(covariant-by-declaration self::A a) → void - return super.{self::C::f}(a as{ForLegacy} self::B); + return super.{self::C::f}(a as self::B); } static method main() → void { self::I i = new self::D::•(); diff --git a/pkg/front_end/testcases/general/issue47072.dart.strong.transformed.expect b/pkg/front_end/testcases/general/issue47072.dart.strong.transformed.expect index d30831c3c4b..d4533e695c1 100644 --- a/pkg/front_end/testcases/general/issue47072.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/general/issue47072.dart.strong.transformed.expect @@ -29,7 +29,7 @@ class D extends self::C implements self::I { : super self::C::•() ; forwarding-stub method f(covariant-by-declaration self::A a) → void - return super.{self::C::f}(a as{ForLegacy} self::B); + return super.{self::C::f}(a as self::B); } static method main() → void { self::I i = new self::D::•(); diff --git a/pkg/front_end/testcases/general/issue47072.dart.weak.expect b/pkg/front_end/testcases/general/issue47072.dart.weak.expect index d30831c3c4b..d4533e695c1 100644 --- a/pkg/front_end/testcases/general/issue47072.dart.weak.expect +++ b/pkg/front_end/testcases/general/issue47072.dart.weak.expect @@ -29,7 +29,7 @@ class D extends self::C implements self::I { : super self::C::•() ; forwarding-stub method f(covariant-by-declaration self::A a) → void - return super.{self::C::f}(a as{ForLegacy} self::B); + return super.{self::C::f}(a as self::B); } static method main() → void { self::I i = new self::D::•(); diff --git a/pkg/front_end/testcases/general/issue47072.dart.weak.modular.expect b/pkg/front_end/testcases/general/issue47072.dart.weak.modular.expect index d30831c3c4b..d4533e695c1 100644 --- a/pkg/front_end/testcases/general/issue47072.dart.weak.modular.expect +++ b/pkg/front_end/testcases/general/issue47072.dart.weak.modular.expect @@ -29,7 +29,7 @@ class D extends self::C implements self::I { : super self::C::•() ; forwarding-stub method f(covariant-by-declaration self::A a) → void - return super.{self::C::f}(a as{ForLegacy} self::B); + return super.{self::C::f}(a as self::B); } static method main() → void { self::I i = new self::D::•(); diff --git a/pkg/front_end/testcases/general/issue47072.dart.weak.outline.expect b/pkg/front_end/testcases/general/issue47072.dart.weak.outline.expect index e13703d9d64..97ff8bc58f1 100644 --- a/pkg/front_end/testcases/general/issue47072.dart.weak.outline.expect +++ b/pkg/front_end/testcases/general/issue47072.dart.weak.outline.expect @@ -25,7 +25,7 @@ class D extends self::C implements self::I { synthetic constructor •() → self::D ; forwarding-stub method f(covariant-by-declaration self::A a) → void - return super.{self::C::f}(a as{ForLegacy} self::B); + return super.{self::C::f}(a as self::B); } static method main() → void ; diff --git a/pkg/front_end/testcases/general/issue47072.dart.weak.transformed.expect b/pkg/front_end/testcases/general/issue47072.dart.weak.transformed.expect index d30831c3c4b..d4533e695c1 100644 --- a/pkg/front_end/testcases/general/issue47072.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/general/issue47072.dart.weak.transformed.expect @@ -29,7 +29,7 @@ class D extends self::C implements self::I { : super self::C::•() ; forwarding-stub method f(covariant-by-declaration self::A a) → void - return super.{self::C::f}(a as{ForLegacy} self::B); + return super.{self::C::f}(a as self::B); } static method main() → void { self::I i = new self::D::•(); diff --git a/pkg/front_end/testcases/general/vm_type_ops.dart.strong.expect b/pkg/front_end/testcases/general/vm_type_ops.dart.strong.expect index 6e5d61342b1..8096c1da8cd 100644 --- a/pkg/front_end/testcases/general/vm_type_ops.dart.strong.expect +++ b/pkg/front_end/testcases/general/vm_type_ops.dart.strong.expect @@ -69,7 +69,7 @@ class H extends self::G implemen ; method foo8(self::H::foo8::Q% a, covariant-by-declaration core::int b, covariant-by-class self::H::T% c) → void {} forwarding-stub method foo7(self::H::foo7::Q% a, covariant-by-declaration core::num b, covariant-by-class self::H::T% c) → void - return super.{self::G::foo7}(a, b as{ForLegacy} core::int, c); + return super.{self::G::foo7}(a, b as core::int, c); } late static field core::List> globalVar; static method foo1(dynamic x) → dynamic { diff --git a/pkg/front_end/testcases/general/vm_type_ops.dart.strong.transformed.expect b/pkg/front_end/testcases/general/vm_type_ops.dart.strong.transformed.expect index eec8d52d409..0087134b843 100644 --- a/pkg/front_end/testcases/general/vm_type_ops.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/general/vm_type_ops.dart.strong.transformed.expect @@ -69,7 +69,7 @@ class H extends self::G implemen ; method foo8(self::H::foo8::Q% a, covariant-by-declaration core::int b, covariant-by-class self::H::T% c) → void {} forwarding-stub method foo7(self::H::foo7::Q% a, covariant-by-declaration core::num b, covariant-by-class self::H::T% c) → void - return super.{self::G::foo7}(a, b as{ForLegacy} core::int, c); + return super.{self::G::foo7}(a, b as core::int, c); } late static field core::List> globalVar; static method foo1(dynamic x) → dynamic { diff --git a/pkg/front_end/testcases/general/vm_type_ops.dart.weak.expect b/pkg/front_end/testcases/general/vm_type_ops.dart.weak.expect index 6e5d61342b1..8096c1da8cd 100644 --- a/pkg/front_end/testcases/general/vm_type_ops.dart.weak.expect +++ b/pkg/front_end/testcases/general/vm_type_ops.dart.weak.expect @@ -69,7 +69,7 @@ class H extends self::G implemen ; method foo8(self::H::foo8::Q% a, covariant-by-declaration core::int b, covariant-by-class self::H::T% c) → void {} forwarding-stub method foo7(self::H::foo7::Q% a, covariant-by-declaration core::num b, covariant-by-class self::H::T% c) → void - return super.{self::G::foo7}(a, b as{ForLegacy} core::int, c); + return super.{self::G::foo7}(a, b as core::int, c); } late static field core::List> globalVar; static method foo1(dynamic x) → dynamic { diff --git a/pkg/front_end/testcases/general/vm_type_ops.dart.weak.modular.expect b/pkg/front_end/testcases/general/vm_type_ops.dart.weak.modular.expect index 6e5d61342b1..8096c1da8cd 100644 --- a/pkg/front_end/testcases/general/vm_type_ops.dart.weak.modular.expect +++ b/pkg/front_end/testcases/general/vm_type_ops.dart.weak.modular.expect @@ -69,7 +69,7 @@ class H extends self::G implemen ; method foo8(self::H::foo8::Q% a, covariant-by-declaration core::int b, covariant-by-class self::H::T% c) → void {} forwarding-stub method foo7(self::H::foo7::Q% a, covariant-by-declaration core::num b, covariant-by-class self::H::T% c) → void - return super.{self::G::foo7}(a, b as{ForLegacy} core::int, c); + return super.{self::G::foo7}(a, b as core::int, c); } late static field core::List> globalVar; static method foo1(dynamic x) → dynamic { diff --git a/pkg/front_end/testcases/general/vm_type_ops.dart.weak.outline.expect b/pkg/front_end/testcases/general/vm_type_ops.dart.weak.outline.expect index d664b6da91e..61afeac558a 100644 --- a/pkg/front_end/testcases/general/vm_type_ops.dart.weak.outline.expect +++ b/pkg/front_end/testcases/general/vm_type_ops.dart.weak.outline.expect @@ -49,7 +49,7 @@ class H extends self::G implemen method foo8(self::H::foo8::Q% a, covariant-by-declaration core::int b, covariant-by-class self::H::T% c) → void ; forwarding-stub method foo7(self::H::foo7::Q% a, covariant-by-declaration core::num b, covariant-by-class self::H::T% c) → void - return super.{self::G::foo7}(a, b as{ForLegacy} core::int, c); + return super.{self::G::foo7}(a, b as core::int, c); } late static field core::List> globalVar; static method foo1(dynamic x) → dynamic diff --git a/pkg/front_end/testcases/general/vm_type_ops.dart.weak.transformed.expect b/pkg/front_end/testcases/general/vm_type_ops.dart.weak.transformed.expect index eec8d52d409..0087134b843 100644 --- a/pkg/front_end/testcases/general/vm_type_ops.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/general/vm_type_ops.dart.weak.transformed.expect @@ -69,7 +69,7 @@ class H extends self::G implemen ; method foo8(self::H::foo8::Q% a, covariant-by-declaration core::int b, covariant-by-class self::H::T% c) → void {} forwarding-stub method foo7(self::H::foo7::Q% a, covariant-by-declaration core::num b, covariant-by-class self::H::T% c) → void - return super.{self::G::foo7}(a, b as{ForLegacy} core::int, c); + return super.{self::G::foo7}(a, b as core::int, c); } late static field core::List> globalVar; static method foo1(dynamic x) → dynamic { diff --git a/pkg/front_end/testcases/incremental/constant_exports_hash.yaml.world.1.expect b/pkg/front_end/testcases/incremental/constant_exports_hash.yaml.world.1.expect index 90f6f3b3be4..1e025c7be57 100644 --- a/pkg/front_end/testcases/incremental/constant_exports_hash.yaml.world.1.expect +++ b/pkg/front_end/testcases/incremental/constant_exports_hash.yaml.world.1.expect @@ -23,7 +23,7 @@ library from "org-dartlang-test:///main.dart" as main { export "org-dartlang-test:///lib1.dart" show x; export "org-dartlang-test:///lib2.dart" show x; - static const field dynamic _exports# = #C1 /*isLegacy*/; + static const field dynamic _exports# = #C1; static method main() → dynamic { dart.core::print("exports"); } diff --git a/pkg/front_end/testcases/incremental/constant_exports_hash.yaml.world.2.expect b/pkg/front_end/testcases/incremental/constant_exports_hash.yaml.world.2.expect index 6c9fb888027..79292ff3184 100644 --- a/pkg/front_end/testcases/incremental/constant_exports_hash.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/constant_exports_hash.yaml.world.2.expect @@ -23,7 +23,7 @@ library from "org-dartlang-test:///main.dart" as main { export "org-dartlang-test:///lib1.dart" show x; export "org-dartlang-test:///lib2.dart" show x; - static const field dynamic _exports# = #C1 /*isLegacy*/; + static const field dynamic _exports# = #C1; static method main() → dynamic { dart.core::print("exports!"); } diff --git a/pkg/front_end/testcases/incremental/export_core.yaml.world.2.expect b/pkg/front_end/testcases/incremental/export_core.yaml.world.2.expect index 641e9031240..e0d31485593 100644 --- a/pkg/front_end/testcases/incremental/export_core.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/export_core.yaml.world.2.expect @@ -84,7 +84,7 @@ additionalExports = (core::ArgumentError, export "dart:core"; - static const field dynamic _exports# = #C1 /*isLegacy*/; + static const field dynamic _exports# = #C1; static method method() → dynamic { dart.core::print("hello"); } diff --git a/pkg/front_end/testcases/incremental/export_core.yaml.world.3.expect b/pkg/front_end/testcases/incremental/export_core.yaml.world.3.expect index ec8d934da62..c933d35fab1 100644 --- a/pkg/front_end/testcases/incremental/export_core.yaml.world.3.expect +++ b/pkg/front_end/testcases/incremental/export_core.yaml.world.3.expect @@ -84,7 +84,7 @@ additionalExports = (core::ArgumentError, export "dart:core"; - static const field dynamic _exports# = #C1 /*isLegacy*/; + static const field dynamic _exports# = #C1; static method method() → dynamic { dart.core::print("hello"); } diff --git a/pkg/front_end/testcases/incremental/export_duplicate.yaml.world.2.expect b/pkg/front_end/testcases/incremental/export_duplicate.yaml.world.2.expect index 90fe0bcd489..87234746b3e 100644 --- a/pkg/front_end/testcases/incremental/export_duplicate.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/export_duplicate.yaml.world.2.expect @@ -11,7 +11,7 @@ library from "org-dartlang-test:///lib1.dart" as lib1 { export "org-dartlang-test:///lib2.dart"; export "org-dartlang-test:///lib3.dart"; - static const field dynamic _exports# = #C1 /*isLegacy*/; + static const field dynamic _exports# = #C1; } library from "org-dartlang-test:///lib2.dart" as lib2 { diff --git a/pkg/front_end/testcases/incremental/export_duplicate.yaml.world.3.expect b/pkg/front_end/testcases/incremental/export_duplicate.yaml.world.3.expect index 2e7b4d8bb67..4712791fa9f 100644 --- a/pkg/front_end/testcases/incremental/export_duplicate.yaml.world.3.expect +++ b/pkg/front_end/testcases/incremental/export_duplicate.yaml.world.3.expect @@ -11,7 +11,7 @@ library from "org-dartlang-test:///lib1.dart" as lib1 { export "org-dartlang-test:///lib2.dart"; export "org-dartlang-test:///lib3.dart"; - static const field dynamic _exports# = #C1 /*isLegacy*/; + static const field dynamic _exports# = #C1; } library from "org-dartlang-test:///lib2.dart" as lib2 { diff --git a/pkg/front_end/testcases/incremental/flutter_widget_factory.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_factory.yaml.world.1.expect index 21b460f559e..f5754843691 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_factory.yaml.world.1.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_factory.yaml.world.1.expect @@ -10,7 +10,7 @@ additionalExports = (wid::widgetFactory) ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation /*hasConstConstructor*/ { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; const constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_factory.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_factory.yaml.world.2.expect index 22b1a04e571..2d7b41fd0f5 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_factory.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_factory.yaml.world.2.expect @@ -10,7 +10,7 @@ additionalExports = (wid::widgetFactory) ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation /*hasConstConstructor*/ { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; const constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_factory_legacy.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_factory_legacy.yaml.world.1.expect index a94ff899362..d72b33d14d4 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_factory_legacy.yaml.world.1.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_factory_legacy.yaml.world.1.expect @@ -10,7 +10,7 @@ additionalExports = (wid::widgetFactory) ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation /*hasConstConstructor*/ { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; const constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_factory_legacy.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_factory_legacy.yaml.world.2.expect index 3ef3235f368..2fd7e88e4f8 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_factory_legacy.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_factory_legacy.yaml.world.2.expect @@ -10,7 +10,7 @@ additionalExports = (wid::widgetFactory) ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation /*hasConstConstructor*/ { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; const constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.1.expect index 2b65093ad9d..feaef4e2e6c 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.1.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.1.expect @@ -7,7 +7,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; synthetic constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.2.expect index 2b65093ad9d..feaef4e2e6c 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.2.expect @@ -7,7 +7,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; synthetic constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.1.expect index 9bb44458be9..9857bef27e2 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.1.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.1.expect @@ -7,7 +7,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation /*hasConstConstructor*/ { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; const constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.2.expect index 60b2ceb225f..76efe678d3f 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.2.expect @@ -7,7 +7,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation /*hasConstConstructor*/ { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; const constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.3.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.3.expect index 4586bcced20..df48412783b 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.3.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.3.expect @@ -7,7 +7,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation /*hasConstConstructor*/ { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; const constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.1.expect index 92e4006aeb3..706aee359fe 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.1.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.1.expect @@ -7,7 +7,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation /*hasConstConstructor*/ { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; const constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.2.expect index 8732cb107c5..fcec175050f 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.2.expect @@ -7,7 +7,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation /*hasConstConstructor*/ { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; const constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform_pattern.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_pattern.yaml.world.1.expect index 477b1fdff96..a1951d10241 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_transform_pattern.yaml.world.1.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_transform_pattern.yaml.world.1.expect @@ -7,7 +7,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; synthetic constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transform_pattern.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_pattern.yaml.world.2.expect index 477b1fdff96..a1951d10241 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_transform_pattern.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_transform_pattern.yaml.world.2.expect @@ -7,7 +7,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; synthetic constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.1.expect index 81633f27f14..a3730744676 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.1.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.1.expect @@ -8,7 +8,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation /*hasConstConstructor*/ { final field dart.core::Object? key; - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; const constructor •({dart.core::Object? key = #C1, wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : fra::Widget::key = key, super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.2.expect index 9b8071f1ca5..9bc2dc36e68 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.2.expect @@ -8,7 +8,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation /*hasConstConstructor*/ { final field dart.core::Object? key; - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; const constructor •({dart.core::Object? key = #C1, wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : fra::Widget::key = key, super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.1.expect index a95fd8494a9..71d5cc0f91a 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.1.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.1.expect @@ -7,7 +7,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation /*hasConstConstructor*/ { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; const constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.2.expect index 2cba094d479..961129233b5 100644 --- a/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.2.expect @@ -7,7 +7,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { ; } abstract class Widget extends fra::Bar implements wid::_HasCreationLocation /*hasConstConstructor*/ { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; const constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super fra::Bar::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/no_outline_change_18.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_18.yaml.world.1.expect index fadf4696649..bc3a9bcdc05 100644 --- a/pkg/front_end/testcases/incremental/no_outline_change_18.yaml.world.1.expect +++ b/pkg/front_end/testcases/incremental/no_outline_change_18.yaml.world.1.expect @@ -27,7 +27,7 @@ library from "org-dartlang-test:///main.dart" as main { export "org-dartlang-test:///lib1.dart" show x; export "org-dartlang-test:///lib2.dart" show x; - static const field dynamic _exports# = #C1 /*isLegacy*/; + static const field dynamic _exports# = #C1; static method main() → dynamic { dart.core::print("exports"); } diff --git a/pkg/front_end/testcases/incremental/no_outline_change_18.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_18.yaml.world.2.expect index d46bdce16d1..2387ec396e8 100644 --- a/pkg/front_end/testcases/incremental/no_outline_change_18.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/no_outline_change_18.yaml.world.2.expect @@ -27,7 +27,7 @@ library from "org-dartlang-test:///main.dart" as main { export "org-dartlang-test:///lib1.dart" show x; export "org-dartlang-test:///lib2.dart" show x; - static const field dynamic _exports# = #C1 /*isLegacy*/; + static const field dynamic _exports# = #C1; static method main() → dynamic { dart.core::print("exports!"); } diff --git a/pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml.world.1.expect index b92e29e8107..c35f795e9fa 100644 --- a/pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml.world.1.expect +++ b/pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml.world.1.expect @@ -4,7 +4,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { import "package:flutter/src/widgets/widget_inspector.dart"; abstract class Widget extends dart.core::Object implements wid::_HasCreationLocation { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; synthetic constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super dart.core::Object::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml.world.2.expect index b92e29e8107..c35f795e9fa 100644 --- a/pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml.world.2.expect +++ b/pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml.world.2.expect @@ -4,7 +4,7 @@ library from "package:flutter/src/widgets/framework.dart" as fra { import "package:flutter/src/widgets/widget_inspector.dart"; abstract class Widget extends dart.core::Object implements wid::_HasCreationLocation { - final field wid::_Location? _location /*isLegacy*/; + final field wid::_Location? _location; synthetic constructor •({wid::_Location? $creationLocationd_0dea112b090073317d4 = #C1}) → fra::Widget : super dart.core::Object::•(), fra::Widget::_location = $creationLocationd_0dea112b090073317d4 ; diff --git a/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.strong.expect b/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.strong.expect index da00788dbdb..c39e0afd2d7 100644 --- a/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.strong.expect +++ b/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.strong.expect @@ -24,7 +24,7 @@ class C extends core::Object { } static method test(self::C c, core::num n) → void { if(c.{self::C::_a}{self::A} is self::B) { - let final self::C #t1 = c in let final core::num #t2 = n in (#t1.{self::C::_a}{self::A} as{ForLegacy,Unchecked} self::B).{self::B::call}(#t2){(core::num) → core::int}; + let final self::C #t1 = c in let final core::num #t2 = n in (#t1.{self::C::_a}{self::A} as{Unchecked} self::B).{self::B::call}(#t2){(core::num) → core::int}; } } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.strong.transformed.expect b/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.strong.transformed.expect index da00788dbdb..c39e0afd2d7 100644 --- a/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.strong.transformed.expect @@ -24,7 +24,7 @@ class C extends core::Object { } static method test(self::C c, core::num n) → void { if(c.{self::C::_a}{self::A} is self::B) { - let final self::C #t1 = c in let final core::num #t2 = n in (#t1.{self::C::_a}{self::A} as{ForLegacy,Unchecked} self::B).{self::B::call}(#t2){(core::num) → core::int}; + let final self::C #t1 = c in let final core::num #t2 = n in (#t1.{self::C::_a}{self::A} as{Unchecked} self::B).{self::B::call}(#t2){(core::num) → core::int}; } } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.weak.expect b/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.weak.expect index da00788dbdb..c39e0afd2d7 100644 --- a/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.weak.expect +++ b/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.weak.expect @@ -24,7 +24,7 @@ class C extends core::Object { } static method test(self::C c, core::num n) → void { if(c.{self::C::_a}{self::A} is self::B) { - let final self::C #t1 = c in let final core::num #t2 = n in (#t1.{self::C::_a}{self::A} as{ForLegacy,Unchecked} self::B).{self::B::call}(#t2){(core::num) → core::int}; + let final self::C #t1 = c in let final core::num #t2 = n in (#t1.{self::C::_a}{self::A} as{Unchecked} self::B).{self::B::call}(#t2){(core::num) → core::int}; } } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.weak.modular.expect b/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.weak.modular.expect index da00788dbdb..c39e0afd2d7 100644 --- a/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.weak.modular.expect +++ b/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.weak.modular.expect @@ -24,7 +24,7 @@ class C extends core::Object { } static method test(self::C c, core::num n) → void { if(c.{self::C::_a}{self::A} is self::B) { - let final self::C #t1 = c in let final core::num #t2 = n in (#t1.{self::C::_a}{self::A} as{ForLegacy,Unchecked} self::B).{self::B::call}(#t2){(core::num) → core::int}; + let final self::C #t1 = c in let final core::num #t2 = n in (#t1.{self::C::_a}{self::A} as{Unchecked} self::B).{self::B::call}(#t2){(core::num) → core::int}; } } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.weak.transformed.expect b/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.weak.transformed.expect index da00788dbdb..c39e0afd2d7 100644 --- a/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/inference_update_2/call_invocation_with_hoisting.dart.weak.transformed.expect @@ -24,7 +24,7 @@ class C extends core::Object { } static method test(self::C c, core::num n) → void { if(c.{self::C::_a}{self::A} is self::B) { - let final self::C #t1 = c in let final core::num #t2 = n in (#t1.{self::C::_a}{self::A} as{ForLegacy,Unchecked} self::B).{self::B::call}(#t2){(core::num) → core::int}; + let final self::C #t1 = c in let final core::num #t2 = n in (#t1.{self::C::_a}{self::A} as{Unchecked} self::B).{self::B::call}(#t2){(core::num) → core::int}; } } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.strong.expect b/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.strong.expect index 1e2f7179adb..f5409ee91fb 100644 --- a/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.strong.expect +++ b/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.strong.expect @@ -24,7 +24,7 @@ static method cascadedNullAwarePropertyAccess(self::C? c) → void { static method cascadedInvocation(self::C c) → void { c.{self::C::_field}{core::Object?} as () → core::int; let final self::C #t4 = c in block { - (#t4.{self::C::_field}{core::Object?} as{ForLegacy,Unchecked} () → core::int)(){() → core::int}.{core::int::toString}(){() → core::String}; + (#t4.{self::C::_field}{core::Object?} as{Unchecked} () → core::int)(){() → core::int}.{core::int::toString}(){() → core::String}; } =>#t4; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.strong.transformed.expect b/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.strong.transformed.expect index a6853513244..01db43bbb6d 100644 --- a/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.strong.transformed.expect @@ -24,7 +24,7 @@ static method cascadedNullAwarePropertyAccess(self::C? c) → void { static method cascadedInvocation(self::C c) → void { c.{self::C::_field}{core::Object?} as () → core::int; let final self::C #t5 = c in block { - (#t5.{self::C::_field}{core::Object?} as{ForLegacy,Unchecked} () → core::int)(){() → core::int}.{core::int::toString}(){() → core::String}; + (#t5.{self::C::_field}{core::Object?} as{Unchecked} () → core::int)(){() → core::int}.{core::int::toString}(){() → core::String}; } =>#t5; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.weak.expect b/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.weak.expect index 1e2f7179adb..f5409ee91fb 100644 --- a/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.weak.expect +++ b/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.weak.expect @@ -24,7 +24,7 @@ static method cascadedNullAwarePropertyAccess(self::C? c) → void { static method cascadedInvocation(self::C c) → void { c.{self::C::_field}{core::Object?} as () → core::int; let final self::C #t4 = c in block { - (#t4.{self::C::_field}{core::Object?} as{ForLegacy,Unchecked} () → core::int)(){() → core::int}.{core::int::toString}(){() → core::String}; + (#t4.{self::C::_field}{core::Object?} as{Unchecked} () → core::int)(){() → core::int}.{core::int::toString}(){() → core::String}; } =>#t4; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.weak.modular.expect b/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.weak.modular.expect index 1e2f7179adb..f5409ee91fb 100644 --- a/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.weak.modular.expect +++ b/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.weak.modular.expect @@ -24,7 +24,7 @@ static method cascadedNullAwarePropertyAccess(self::C? c) → void { static method cascadedInvocation(self::C c) → void { c.{self::C::_field}{core::Object?} as () → core::int; let final self::C #t4 = c in block { - (#t4.{self::C::_field}{core::Object?} as{ForLegacy,Unchecked} () → core::int)(){() → core::int}.{core::int::toString}(){() → core::String}; + (#t4.{self::C::_field}{core::Object?} as{Unchecked} () → core::int)(){() → core::int}.{core::int::toString}(){() → core::String}; } =>#t4; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.weak.transformed.expect b/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.weak.transformed.expect index 1e2f7179adb..f5409ee91fb 100644 --- a/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/inference_update_2/cascaded_field_promotion.dart.weak.transformed.expect @@ -24,7 +24,7 @@ static method cascadedNullAwarePropertyAccess(self::C? c) → void { static method cascadedInvocation(self::C c) → void { c.{self::C::_field}{core::Object?} as () → core::int; let final self::C #t4 = c in block { - (#t4.{self::C::_field}{core::Object?} as{ForLegacy,Unchecked} () → core::int)(){() → core::int}.{core::int::toString}(){() → core::String}; + (#t4.{self::C::_field}{core::Object?} as{Unchecked} () → core::int)(){() → core::int}.{core::int::toString}(){() → core::String}; } =>#t4; } static method main() → dynamic {} diff --git a/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.strong.expect b/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.strong.expect index c5782da4ed8..95c3b4f496f 100644 --- a/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.strong.expect +++ b/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.strong.expect @@ -19,7 +19,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///ambiguous_main_export_lib1.dart"; export "org-dartlang-testcase:///ambiguous_main_export_lib2.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self3; diff --git a/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.strong.transformed.expect index c5782da4ed8..95c3b4f496f 100644 --- a/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.strong.transformed.expect @@ -19,7 +19,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///ambiguous_main_export_lib1.dart"; export "org-dartlang-testcase:///ambiguous_main_export_lib2.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self3; diff --git a/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.expect b/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.expect index c5782da4ed8..95c3b4f496f 100644 --- a/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.expect +++ b/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.expect @@ -19,7 +19,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///ambiguous_main_export_lib1.dart"; export "org-dartlang-testcase:///ambiguous_main_export_lib2.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self3; diff --git a/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.modular.expect index c5782da4ed8..95c3b4f496f 100644 --- a/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.modular.expect +++ b/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.modular.expect @@ -19,7 +19,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///ambiguous_main_export_lib1.dart"; export "org-dartlang-testcase:///ambiguous_main_export_lib2.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self3; diff --git a/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.outline.expect b/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.outline.expect index 0520d4cd71f..4907f47182c 100644 --- a/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.outline.expect +++ b/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.outline.expect @@ -19,7 +19,7 @@ import self as self2; export "org-dartlang-testcase:///ambiguous_main_export_lib1.dart"; export "org-dartlang-testcase:///ambiguous_main_export_lib2.dart"; -static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/nnbd/ambiguous_main_export_lib1.dart' and 'pkg/front_end/testcases/nnbd/ambiguous_main_export_lib2.dart'.\"}" /*isLegacy*/; +static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/nnbd/ambiguous_main_export_lib1.dart' and 'pkg/front_end/testcases/nnbd/ambiguous_main_export_lib2.dart'.\"}"; library; import self as self3; diff --git a/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.transformed.expect index c5782da4ed8..95c3b4f496f 100644 --- a/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/nnbd/ambiguous_main_export.dart.weak.transformed.expect @@ -19,7 +19,7 @@ import "dart:core" as core; export "org-dartlang-testcase:///ambiguous_main_export_lib1.dart"; export "org-dartlang-testcase:///ambiguous_main_export_lib2.dart"; -static const field dynamic _exports# = #C1 /*isLegacy*/; +static const field dynamic _exports# = #C1; library; import self as self3; diff --git a/pkg/front_end/testcases/nnbd/assignability.dart.strong.expect b/pkg/front_end/testcases/nnbd/assignability.dart.strong.expect index 643444680d2..8bb6c59f5f1 100644 --- a/pkg/front_end/testcases/nnbd/assignability.dart.strong.expect +++ b/pkg/front_end/testcases/nnbd/assignability.dart.strong.expect @@ -1331,7 +1331,7 @@ static method error}.(0){(invalid-type) → invalid-type}; core::Function f1 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:29:17: Error: Can't tear off method 'call' from a potentially null value. Function f1 = a; - ^" in a as{TypeError,ForLegacy} core::Function; + ^" in a as{TypeError} core::Function; () → void f2 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:30:24: Error: Can't tear off method 'call' from a potentially null value. void Function() f2 = a; - ^" in a as{TypeError,ForLegacy} () → void; + ^" in a as{TypeError} () → void; () →? void f3 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:31:25: Error: Can't tear off method 'call' from a potentially null value. void Function()? f3 = a; - ^" in a as{TypeError,ForLegacy} () →? void; + ^" in a as{TypeError} () →? void; } static method ok(core::String? s, self::A? a, self::ok::T% t, self::B? b, core::Invocation i) → dynamic { s =={core::String::==}{(core::Object) → core::bool} s; diff --git a/pkg/front_end/testcases/nnbd/nullable_receiver.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/nullable_receiver.dart.strong.transformed.expect index e48d1ce2c7f..0578a5709e8 100644 --- a/pkg/front_end/testcases/nnbd/nullable_receiver.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/nnbd/nullable_receiver.dart.strong.transformed.expect @@ -108,13 +108,13 @@ Try removing the extra positional arguments. ^" in b.{core::Object::toString}{}.(0){(invalid-type) → invalid-type}; core::Function f1 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:29:17: Error: Can't tear off method 'call' from a potentially null value. Function f1 = a; - ^" in a as{TypeError,ForLegacy} core::Function; + ^" in a as{TypeError} core::Function; () → void f2 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:30:24: Error: Can't tear off method 'call' from a potentially null value. void Function() f2 = a; - ^" in a as{TypeError,ForLegacy} () → void; + ^" in a as{TypeError} () → void; () →? void f3 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:31:25: Error: Can't tear off method 'call' from a potentially null value. void Function()? f3 = a; - ^" in a as{TypeError,ForLegacy} () →? void; + ^" in a as{TypeError} () →? void; } static method ok(core::String? s, self::A? a, self::ok::T% t, self::B? b, core::Invocation i) → dynamic { s =={core::String::==}{(core::Object) → core::bool} s; diff --git a/pkg/front_end/testcases/nnbd/nullable_receiver.dart.weak.expect b/pkg/front_end/testcases/nnbd/nullable_receiver.dart.weak.expect index e48d1ce2c7f..0578a5709e8 100644 --- a/pkg/front_end/testcases/nnbd/nullable_receiver.dart.weak.expect +++ b/pkg/front_end/testcases/nnbd/nullable_receiver.dart.weak.expect @@ -108,13 +108,13 @@ Try removing the extra positional arguments. ^" in b.{core::Object::toString}{}.(0){(invalid-type) → invalid-type}; core::Function f1 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:29:17: Error: Can't tear off method 'call' from a potentially null value. Function f1 = a; - ^" in a as{TypeError,ForLegacy} core::Function; + ^" in a as{TypeError} core::Function; () → void f2 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:30:24: Error: Can't tear off method 'call' from a potentially null value. void Function() f2 = a; - ^" in a as{TypeError,ForLegacy} () → void; + ^" in a as{TypeError} () → void; () →? void f3 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:31:25: Error: Can't tear off method 'call' from a potentially null value. void Function()? f3 = a; - ^" in a as{TypeError,ForLegacy} () →? void; + ^" in a as{TypeError} () →? void; } static method ok(core::String? s, self::A? a, self::ok::T% t, self::B? b, core::Invocation i) → dynamic { s =={core::String::==}{(core::Object) → core::bool} s; diff --git a/pkg/front_end/testcases/nnbd/nullable_receiver.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/nullable_receiver.dart.weak.modular.expect index e48d1ce2c7f..0578a5709e8 100644 --- a/pkg/front_end/testcases/nnbd/nullable_receiver.dart.weak.modular.expect +++ b/pkg/front_end/testcases/nnbd/nullable_receiver.dart.weak.modular.expect @@ -108,13 +108,13 @@ Try removing the extra positional arguments. ^" in b.{core::Object::toString}{}.(0){(invalid-type) → invalid-type}; core::Function f1 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:29:17: Error: Can't tear off method 'call' from a potentially null value. Function f1 = a; - ^" in a as{TypeError,ForLegacy} core::Function; + ^" in a as{TypeError} core::Function; () → void f2 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:30:24: Error: Can't tear off method 'call' from a potentially null value. void Function() f2 = a; - ^" in a as{TypeError,ForLegacy} () → void; + ^" in a as{TypeError} () → void; () →? void f3 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:31:25: Error: Can't tear off method 'call' from a potentially null value. void Function()? f3 = a; - ^" in a as{TypeError,ForLegacy} () →? void; + ^" in a as{TypeError} () →? void; } static method ok(core::String? s, self::A? a, self::ok::T% t, self::B? b, core::Invocation i) → dynamic { s =={core::String::==}{(core::Object) → core::bool} s; diff --git a/pkg/front_end/testcases/nnbd/nullable_receiver.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/nullable_receiver.dart.weak.transformed.expect index e48d1ce2c7f..0578a5709e8 100644 --- a/pkg/front_end/testcases/nnbd/nullable_receiver.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/nnbd/nullable_receiver.dart.weak.transformed.expect @@ -108,13 +108,13 @@ Try removing the extra positional arguments. ^" in b.{core::Object::toString}{}.(0){(invalid-type) → invalid-type}; core::Function f1 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:29:17: Error: Can't tear off method 'call' from a potentially null value. Function f1 = a; - ^" in a as{TypeError,ForLegacy} core::Function; + ^" in a as{TypeError} core::Function; () → void f2 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:30:24: Error: Can't tear off method 'call' from a potentially null value. void Function() f2 = a; - ^" in a as{TypeError,ForLegacy} () → void; + ^" in a as{TypeError} () → void; () →? void f3 = invalid-expression "pkg/front_end/testcases/nnbd/nullable_receiver.dart:31:25: Error: Can't tear off method 'call' from a potentially null value. void Function()? f3 = a; - ^" in a as{TypeError,ForLegacy} () →? void; + ^" in a as{TypeError} () →? void; } static method ok(core::String? s, self::A? a, self::ok::T% t, self::B? b, core::Invocation i) → dynamic { s =={core::String::==}{(core::Object) → core::bool} s; diff --git a/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.strong.expect b/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.strong.expect index 10fcbbb2f3d..f3731f0e688 100644 --- a/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.strong.expect +++ b/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.strong.expect @@ -49,28 +49,28 @@ static method nullableFunctionContext(() →? core::int f) → dynamic {} static method foo(self::C? c, self::foo::T% t, self::foo::T? nt) → dynamic { self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:14:24: Error: Can't tear off method 'call' from a potentially null value. functionContext(null as C?); // Error. - ^" in (null as self::C?) as{TypeError,ForLegacy} () → core::int); + ^" in (null as self::C?) as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:15:32: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(null as C?); // Error. - ^" in (null as self::C?) as{TypeError,ForLegacy} () →? core::int); + ^" in (null as self::C?) as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:16:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(c); // Error. - ^" in c as{TypeError,ForLegacy} () → core::int); + ^" in c as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:17:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(c); // Error. - ^" in c as{TypeError,ForLegacy} () →? core::int); + ^" in c as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:18:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(t); // Error. - ^" in t as{TypeError,ForLegacy} () → core::int); + ^" in t as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:19:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(t); // Error. - ^" in t as{TypeError,ForLegacy} () →? core::int); + ^" in t as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:20:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(nt); // Error. - ^" in nt as{TypeError,ForLegacy} () → core::int); + ^" in nt as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:21:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(nt); // Error. - ^" in nt as{TypeError,ForLegacy} () →? core::int); + ^" in nt as{TypeError} () →? core::int); } static method bar(self::C c, self::bar::T t) → dynamic { self::functionContext(let final self::C #t1 = c in #t1 == null ?{() → core::int} null : #t1.{self::C::call}{() → core::int}); diff --git a/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.strong.transformed.expect b/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.strong.transformed.expect index 9daa9e8c11e..09578596d58 100644 --- a/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.strong.transformed.expect @@ -49,28 +49,28 @@ static method nullableFunctionContext(() →? core::int f) → dynamic {} static method foo(self::C? c, self::foo::T% t, self::foo::T? nt) → dynamic { self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:14:24: Error: Can't tear off method 'call' from a potentially null value. functionContext(null as C?); // Error. - ^" in (null as{Unchecked} self::C?) as{TypeError,ForLegacy} () → core::int); + ^" in (null as{Unchecked} self::C?) as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:15:32: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(null as C?); // Error. - ^" in (null as{Unchecked} self::C?) as{TypeError,ForLegacy} () →? core::int); + ^" in (null as{Unchecked} self::C?) as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:16:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(c); // Error. - ^" in c as{TypeError,ForLegacy} () → core::int); + ^" in c as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:17:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(c); // Error. - ^" in c as{TypeError,ForLegacy} () →? core::int); + ^" in c as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:18:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(t); // Error. - ^" in t as{TypeError,ForLegacy} () → core::int); + ^" in t as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:19:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(t); // Error. - ^" in t as{TypeError,ForLegacy} () →? core::int); + ^" in t as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:20:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(nt); // Error. - ^" in nt as{TypeError,ForLegacy} () → core::int); + ^" in nt as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:21:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(nt); // Error. - ^" in nt as{TypeError,ForLegacy} () →? core::int); + ^" in nt as{TypeError} () →? core::int); } static method bar(self::C c, self::bar::T t) → dynamic { self::functionContext(let final self::C #t1 = c in #t1 == null ?{() → core::int} null : #t1.{self::C::call}{() → core::int}); diff --git a/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.weak.expect b/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.weak.expect index 10fcbbb2f3d..f3731f0e688 100644 --- a/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.weak.expect +++ b/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.weak.expect @@ -49,28 +49,28 @@ static method nullableFunctionContext(() →? core::int f) → dynamic {} static method foo(self::C? c, self::foo::T% t, self::foo::T? nt) → dynamic { self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:14:24: Error: Can't tear off method 'call' from a potentially null value. functionContext(null as C?); // Error. - ^" in (null as self::C?) as{TypeError,ForLegacy} () → core::int); + ^" in (null as self::C?) as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:15:32: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(null as C?); // Error. - ^" in (null as self::C?) as{TypeError,ForLegacy} () →? core::int); + ^" in (null as self::C?) as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:16:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(c); // Error. - ^" in c as{TypeError,ForLegacy} () → core::int); + ^" in c as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:17:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(c); // Error. - ^" in c as{TypeError,ForLegacy} () →? core::int); + ^" in c as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:18:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(t); // Error. - ^" in t as{TypeError,ForLegacy} () → core::int); + ^" in t as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:19:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(t); // Error. - ^" in t as{TypeError,ForLegacy} () →? core::int); + ^" in t as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:20:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(nt); // Error. - ^" in nt as{TypeError,ForLegacy} () → core::int); + ^" in nt as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:21:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(nt); // Error. - ^" in nt as{TypeError,ForLegacy} () →? core::int); + ^" in nt as{TypeError} () →? core::int); } static method bar(self::C c, self::bar::T t) → dynamic { self::functionContext(let final self::C #t1 = c in #t1 == null ?{() → core::int} null : #t1.{self::C::call}{() → core::int}); diff --git a/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.weak.modular.expect b/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.weak.modular.expect index 10fcbbb2f3d..f3731f0e688 100644 --- a/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.weak.modular.expect +++ b/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.weak.modular.expect @@ -49,28 +49,28 @@ static method nullableFunctionContext(() →? core::int f) → dynamic {} static method foo(self::C? c, self::foo::T% t, self::foo::T? nt) → dynamic { self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:14:24: Error: Can't tear off method 'call' from a potentially null value. functionContext(null as C?); // Error. - ^" in (null as self::C?) as{TypeError,ForLegacy} () → core::int); + ^" in (null as self::C?) as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:15:32: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(null as C?); // Error. - ^" in (null as self::C?) as{TypeError,ForLegacy} () →? core::int); + ^" in (null as self::C?) as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:16:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(c); // Error. - ^" in c as{TypeError,ForLegacy} () → core::int); + ^" in c as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:17:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(c); // Error. - ^" in c as{TypeError,ForLegacy} () →? core::int); + ^" in c as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:18:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(t); // Error. - ^" in t as{TypeError,ForLegacy} () → core::int); + ^" in t as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:19:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(t); // Error. - ^" in t as{TypeError,ForLegacy} () →? core::int); + ^" in t as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:20:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(nt); // Error. - ^" in nt as{TypeError,ForLegacy} () → core::int); + ^" in nt as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:21:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(nt); // Error. - ^" in nt as{TypeError,ForLegacy} () →? core::int); + ^" in nt as{TypeError} () →? core::int); } static method bar(self::C c, self::bar::T t) → dynamic { self::functionContext(let final self::C #t1 = c in #t1 == null ?{() → core::int} null : #t1.{self::C::call}{() → core::int}); diff --git a/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.weak.transformed.expect b/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.weak.transformed.expect index 9daa9e8c11e..09578596d58 100644 --- a/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart.weak.transformed.expect @@ -49,28 +49,28 @@ static method nullableFunctionContext(() →? core::int f) → dynamic {} static method foo(self::C? c, self::foo::T% t, self::foo::T? nt) → dynamic { self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:14:24: Error: Can't tear off method 'call' from a potentially null value. functionContext(null as C?); // Error. - ^" in (null as{Unchecked} self::C?) as{TypeError,ForLegacy} () → core::int); + ^" in (null as{Unchecked} self::C?) as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:15:32: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(null as C?); // Error. - ^" in (null as{Unchecked} self::C?) as{TypeError,ForLegacy} () →? core::int); + ^" in (null as{Unchecked} self::C?) as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:16:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(c); // Error. - ^" in c as{TypeError,ForLegacy} () → core::int); + ^" in c as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:17:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(c); // Error. - ^" in c as{TypeError,ForLegacy} () →? core::int); + ^" in c as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:18:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(t); // Error. - ^" in t as{TypeError,ForLegacy} () → core::int); + ^" in t as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:19:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(t); // Error. - ^" in t as{TypeError,ForLegacy} () →? core::int); + ^" in t as{TypeError} () →? core::int); self::functionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:20:19: Error: Can't tear off method 'call' from a potentially null value. functionContext(nt); // Error. - ^" in nt as{TypeError,ForLegacy} () → core::int); + ^" in nt as{TypeError} () → core::int); self::nullableFunctionContext(invalid-expression "pkg/front_end/testcases/nnbd/tearoff_from_nullable_receiver.dart:21:27: Error: Can't tear off method 'call' from a potentially null value. nullableFunctionContext(nt); // Error. - ^" in nt as{TypeError,ForLegacy} () →? core::int); + ^" in nt as{TypeError} () →? core::int); } static method bar(self::C c, self::bar::T t) → dynamic { self::functionContext(let final self::C #t1 = c in #t1 == null ?{() → core::int} null : #t1.{self::C::call}{() → core::int}); diff --git a/pkg/front_end/testcases/none/property_get.dart.strong.expect b/pkg/front_end/testcases/none/property_get.dart.strong.expect index 643e56406ab..e999fb4c789 100644 --- a/pkg/front_end/testcases/none/property_get.dart.strong.expect +++ b/pkg/front_end/testcases/none/property_get.dart.strong.expect @@ -87,7 +87,7 @@ static method test(self: core::Function f1 = let final self::Class2 #t5 = nonNullableClass2 in #t5 == null ?{() → core::int} null : #t5.{self::Class2::call}{() → core::int}; core::Function? f2 = invalid-expression "pkg/front_end/testcases/none/property_get.dart:67:18: Error: Can't tear off method 'call' from a potentially null value. Function? f2 = nullableClass2; - ^" in nullableClass2 as{TypeError,ForLegacy} core::Function?; + ^" in nullableClass2 as{TypeError} core::Function?; core::print("StaticGet"); self::Class1::staticField; self::topLevelField; diff --git a/pkg/front_end/testcases/none/property_get.dart.strong.transformed.expect b/pkg/front_end/testcases/none/property_get.dart.strong.transformed.expect index 643e56406ab..e999fb4c789 100644 --- a/pkg/front_end/testcases/none/property_get.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/none/property_get.dart.strong.transformed.expect @@ -87,7 +87,7 @@ static method test(self: core::Function f1 = let final self::Class2 #t5 = nonNullableClass2 in #t5 == null ?{() → core::int} null : #t5.{self::Class2::call}{() → core::int}; core::Function? f2 = invalid-expression "pkg/front_end/testcases/none/property_get.dart:67:18: Error: Can't tear off method 'call' from a potentially null value. Function? f2 = nullableClass2; - ^" in nullableClass2 as{TypeError,ForLegacy} core::Function?; + ^" in nullableClass2 as{TypeError} core::Function?; core::print("StaticGet"); self::Class1::staticField; self::topLevelField; diff --git a/pkg/front_end/testcases/none/property_get.dart.weak.expect b/pkg/front_end/testcases/none/property_get.dart.weak.expect index a0e2d1f40d0..e586f7016f1 100644 --- a/pkg/front_end/testcases/none/property_get.dart.weak.expect +++ b/pkg/front_end/testcases/none/property_get.dart.weak.expect @@ -88,7 +88,7 @@ static method test(self: core::Function f1 = let final self::Class2 #t5 = nonNullableClass2 in #t5 == null ?{() → core::int} null : #t5.{self::Class2::call}{() → core::int}; core::Function? f2 = invalid-expression "pkg/front_end/testcases/none/property_get.dart:67:18: Error: Can't tear off method 'call' from a potentially null value. Function? f2 = nullableClass2; - ^" in nullableClass2 as{TypeError,ForLegacy} core::Function?; + ^" in nullableClass2 as{TypeError} core::Function?; core::print("StaticGet"); self::Class1::staticField; self::topLevelField; diff --git a/pkg/front_end/testcases/none/property_get.dart.weak.modular.expect b/pkg/front_end/testcases/none/property_get.dart.weak.modular.expect index a0e2d1f40d0..e586f7016f1 100644 --- a/pkg/front_end/testcases/none/property_get.dart.weak.modular.expect +++ b/pkg/front_end/testcases/none/property_get.dart.weak.modular.expect @@ -88,7 +88,7 @@ static method test(self: core::Function f1 = let final self::Class2 #t5 = nonNullableClass2 in #t5 == null ?{() → core::int} null : #t5.{self::Class2::call}{() → core::int}; core::Function? f2 = invalid-expression "pkg/front_end/testcases/none/property_get.dart:67:18: Error: Can't tear off method 'call' from a potentially null value. Function? f2 = nullableClass2; - ^" in nullableClass2 as{TypeError,ForLegacy} core::Function?; + ^" in nullableClass2 as{TypeError} core::Function?; core::print("StaticGet"); self::Class1::staticField; self::topLevelField; diff --git a/pkg/front_end/testcases/none/property_get.dart.weak.transformed.expect b/pkg/front_end/testcases/none/property_get.dart.weak.transformed.expect index a0e2d1f40d0..e586f7016f1 100644 --- a/pkg/front_end/testcases/none/property_get.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/none/property_get.dart.weak.transformed.expect @@ -88,7 +88,7 @@ static method test(self: core::Function f1 = let final self::Class2 #t5 = nonNullableClass2 in #t5 == null ?{() → core::int} null : #t5.{self::Class2::call}{() → core::int}; core::Function? f2 = invalid-expression "pkg/front_end/testcases/none/property_get.dart:67:18: Error: Can't tear off method 'call' from a potentially null value. Function? f2 = nullableClass2; - ^" in nullableClass2 as{TypeError,ForLegacy} core::Function?; + ^" in nullableClass2 as{TypeError} core::Function?; core::print("StaticGet"); self::Class1::staticField; self::topLevelField; diff --git a/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.strong.expect b/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.strong.expect index 9e6669748a5..ed0a29bbd0d 100644 --- a/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.strong.expect +++ b/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.strong.expect @@ -32,6 +32,6 @@ class D extends self::C implements self::B { : super self::C::•() ; forwarding-stub set x(covariant-by-declaration core::num value) → void - return super.{self::C::x} = value as{ForLegacy} core::int; + return super.{self::C::x} = value as core::int; } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.strong.transformed.expect b/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.strong.transformed.expect index 9e6669748a5..ed0a29bbd0d 100644 --- a/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.strong.transformed.expect @@ -32,6 +32,6 @@ class D extends self::C implements self::B { : super self::C::•() ; forwarding-stub set x(covariant-by-declaration core::num value) → void - return super.{self::C::x} = value as{ForLegacy} core::int; + return super.{self::C::x} = value as core::int; } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.expect b/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.expect index 9e6669748a5..ed0a29bbd0d 100644 --- a/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.expect +++ b/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.expect @@ -32,6 +32,6 @@ class D extends self::C implements self::B { : super self::C::•() ; forwarding-stub set x(covariant-by-declaration core::num value) → void - return super.{self::C::x} = value as{ForLegacy} core::int; + return super.{self::C::x} = value as core::int; } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.modular.expect b/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.modular.expect index 9e6669748a5..ed0a29bbd0d 100644 --- a/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.modular.expect +++ b/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.modular.expect @@ -32,6 +32,6 @@ class D extends self::C implements self::B { : super self::C::•() ; forwarding-stub set x(covariant-by-declaration core::num value) → void - return super.{self::C::x} = value as{ForLegacy} core::int; + return super.{self::C::x} = value as core::int; } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.outline.expect b/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.outline.expect index 0ecbc29fce8..1071746b1c3 100644 --- a/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.outline.expect +++ b/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.outline.expect @@ -29,7 +29,7 @@ class D extends self::C implements self::B { synthetic constructor •() → self::D ; forwarding-stub set x(covariant-by-declaration core::num value) → void - return super.{self::C::x} = value as{ForLegacy} core::int; + return super.{self::C::x} = value as core::int; } static method main() → void ; diff --git a/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.transformed.expect b/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.transformed.expect index 9e6669748a5..ed0a29bbd0d 100644 --- a/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/runtime_checks_new/field_forwarding_stub_explicit_covariant.dart.weak.transformed.expect @@ -32,6 +32,6 @@ class D extends self::C implements self::B { : super self::C::•() ; forwarding-stub set x(covariant-by-declaration core::num value) → void - return super.{self::C::x} = value as{ForLegacy} core::int; + return super.{self::C::x} = value as core::int; } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.strong.expect b/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.strong.expect index 830affe65a6..ce8d014cbf5 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.strong.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.strong.expect @@ -22,7 +22,7 @@ class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-declaration core::Object x) → core::int - return super.{self::B::f}(x as{ForLegacy} core::int); + return super.{self::B::f}(x as core::int); } static method expectTypeError(() → void callback) → void { try { diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.strong.transformed.expect b/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.strong.transformed.expect index 830affe65a6..ce8d014cbf5 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.strong.transformed.expect @@ -22,7 +22,7 @@ class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-declaration core::Object x) → core::int - return super.{self::B::f}(x as{ForLegacy} core::int); + return super.{self::B::f}(x as core::int); } static method expectTypeError(() → void callback) → void { try { diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.expect b/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.expect index 830affe65a6..ce8d014cbf5 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.expect @@ -22,7 +22,7 @@ class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-declaration core::Object x) → core::int - return super.{self::B::f}(x as{ForLegacy} core::int); + return super.{self::B::f}(x as core::int); } static method expectTypeError(() → void callback) → void { try { diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.modular.expect b/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.modular.expect index 830affe65a6..ce8d014cbf5 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.modular.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.modular.expect @@ -22,7 +22,7 @@ class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-declaration core::Object x) → core::int - return super.{self::B::f}(x as{ForLegacy} core::int); + return super.{self::B::f}(x as core::int); } static method expectTypeError(() → void callback) → void { try { diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.outline.expect b/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.outline.expect index b8ecd35b224..a84218a2fa3 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.outline.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.outline.expect @@ -17,7 +17,7 @@ class C extends self::B implements self::I { synthetic constructor •() → self::C ; forwarding-stub method f(covariant-by-declaration core::Object x) → core::int - return super.{self::B::f}(x as{ForLegacy} core::int); + return super.{self::B::f}(x as core::int); } static method expectTypeError(() → void callback) → void ; diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.transformed.expect b/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.transformed.expect index 830affe65a6..ce8d014cbf5 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_checked_via_target.dart.weak.transformed.expect @@ -22,7 +22,7 @@ class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-declaration core::Object x) → core::int - return super.{self::B::f}(x as{ForLegacy} core::int); + return super.{self::B::f}(x as core::int); } static method expectTypeError(() → void callback) → void { try { diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.strong.expect b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.strong.expect index c31d009db5d..1e99334450f 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.strong.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.strong.expect @@ -19,6 +19,6 @@ abstract class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-class core::int x, core::Object y) → void - return super.{self::B::f}(x, y as{ForLegacy} core::int); + return super.{self::B::f}(x, y as core::int); } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.strong.transformed.expect b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.strong.transformed.expect index c31d009db5d..1e99334450f 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.strong.transformed.expect @@ -19,6 +19,6 @@ abstract class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-class core::int x, core::Object y) → void - return super.{self::B::f}(x, y as{ForLegacy} core::int); + return super.{self::B::f}(x, y as core::int); } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.expect b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.expect index c31d009db5d..1e99334450f 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.expect @@ -19,6 +19,6 @@ abstract class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-class core::int x, core::Object y) → void - return super.{self::B::f}(x, y as{ForLegacy} core::int); + return super.{self::B::f}(x, y as core::int); } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.modular.expect b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.modular.expect index c31d009db5d..1e99334450f 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.modular.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.modular.expect @@ -19,6 +19,6 @@ abstract class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-class core::int x, core::Object y) → void - return super.{self::B::f}(x, y as{ForLegacy} core::int); + return super.{self::B::f}(x, y as core::int); } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.outline.expect b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.outline.expect index 9e34180c9e1..bae247cf55f 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.outline.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.outline.expect @@ -17,7 +17,7 @@ abstract class C extends self::B implements self::I { synthetic constructor •() → self::C ; forwarding-stub method f(covariant-by-class core::int x, core::Object y) → void - return super.{self::B::f}(x, y as{ForLegacy} core::int); + return super.{self::B::f}(x, y as core::int); } static method main() → void ; diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.transformed.expect b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.transformed.expect index c31d009db5d..1e99334450f 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariantImpl_from_interface.dart.weak.transformed.expect @@ -19,6 +19,6 @@ abstract class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-class core::int x, core::Object y) → void - return super.{self::B::f}(x, y as{ForLegacy} core::int); + return super.{self::B::f}(x, y as core::int); } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.strong.expect b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.strong.expect index 1a67fea093f..27c8f078857 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.strong.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.strong.expect @@ -19,6 +19,6 @@ abstract class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-declaration core::int x, core::Object y) → void - return super.{self::B::f}(x, y as{ForLegacy} core::int); + return super.{self::B::f}(x, y as core::int); } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.strong.transformed.expect b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.strong.transformed.expect index 1a67fea093f..27c8f078857 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.strong.transformed.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.strong.transformed.expect @@ -19,6 +19,6 @@ abstract class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-declaration core::int x, core::Object y) → void - return super.{self::B::f}(x, y as{ForLegacy} core::int); + return super.{self::B::f}(x, y as core::int); } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.expect b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.expect index 1a67fea093f..27c8f078857 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.expect @@ -19,6 +19,6 @@ abstract class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-declaration core::int x, core::Object y) → void - return super.{self::B::f}(x, y as{ForLegacy} core::int); + return super.{self::B::f}(x, y as core::int); } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.modular.expect b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.modular.expect index 1a67fea093f..27c8f078857 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.modular.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.modular.expect @@ -19,6 +19,6 @@ abstract class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-declaration core::int x, core::Object y) → void - return super.{self::B::f}(x, y as{ForLegacy} core::int); + return super.{self::B::f}(x, y as core::int); } static method main() → void {} diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.outline.expect b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.outline.expect index 8812e318239..785316b18b8 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.outline.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.outline.expect @@ -17,7 +17,7 @@ abstract class C extends self::B implements self::I { synthetic constructor •() → self::C ; forwarding-stub method f(covariant-by-declaration core::int x, core::Object y) → void - return super.{self::B::f}(x, y as{ForLegacy} core::int); + return super.{self::B::f}(x, y as core::int); } static method main() → void ; diff --git a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.transformed.expect b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.transformed.expect index 1a67fea093f..27c8f078857 100644 --- a/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.transformed.expect +++ b/pkg/front_end/testcases/runtime_checks_new/stub_from_interface_covariant_from_interface.dart.weak.transformed.expect @@ -19,6 +19,6 @@ abstract class C extends self::B implements self::I { : super self::B::•() ; forwarding-stub method f(covariant-by-declaration core::int x, core::Object y) → void - return super.{self::B::f}(x, y as{ForLegacy} core::int); + return super.{self::B::f}(x, y as core::int); } static method main() → void {} diff --git a/pkg/front_end/tool/_fasta/command_line.dart b/pkg/front_end/tool/_fasta/command_line.dart index 0fdba341026..0bb96b72c71 100644 --- a/pkg/front_end/tool/_fasta/command_line.dart +++ b/pkg/front_end/tool/_fasta/command_line.dart @@ -179,7 +179,7 @@ ProcessedOptions analyzeCommandLine(String programName, final NnbdMode nnbdMode = nnbdAgnosticMode ? NnbdMode.Agnostic - : (nnbdStrongMode ? NnbdMode.Strong : NnbdMode.Weak); + : (nnbdWeakMode ? NnbdMode.Weak : NnbdMode.Strong); final bool enableUnscheduledExperiments = Options.enableUnscheduledExperiments.read(parsedOptions); diff --git a/pkg/front_end/tool/incremental_perf.dart b/pkg/front_end/tool/incremental_perf.dart index dc1c3bbbad7..dc06a3b0909 100644 --- a/pkg/front_end/tool/incremental_perf.dart +++ b/pkg/front_end/tool/incremental_perf.dart @@ -50,6 +50,7 @@ import 'package:front_end/src/api_prototype/front_end.dart'; import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart'; import 'package:front_end/src/api_prototype/memory_file_system.dart'; import 'package:front_end/src/api_prototype/standard_file_system.dart'; +import 'package:front_end/src/base/nnbd_mode.dart'; import 'package:front_end/src/base/processed_options.dart'; import 'package:front_end/src/fasta/uri_translator.dart'; @@ -107,6 +108,7 @@ Future benchmark( ..fileSystem = overlayFs ..onDiagnostic = onDiagnosticMessageHandler() ..target = createTarget(isFlutter: isFlutter) + ..nnbdMode = NnbdMode.Weak ..environmentDefines = const {}; if (sdkSummary != null) { compilerOptions.sdkSummary = _resolveOverlayUri(sdkSummary); diff --git a/pkg/kernel/binary.md b/pkg/kernel/binary.md index 33626e39442..a5d0d8fac23 100644 --- a/pkg/kernel/binary.md +++ b/pkg/kernel/binary.md @@ -147,7 +147,7 @@ type CanonicalName { type ComponentFile { UInt32 magic = 0x90ABCDEF; - UInt32 formatVersion = 116; + UInt32 formatVersion = 117; Byte[10] shortSdkHash; List problemsAsJson; // Described in problems.md. Library[] libraries; @@ -242,7 +242,7 @@ type Name { } type Library { - Byte flags (isSynthetic, isNonNullableByDefault, nnbdModeBit1, nnbdModeBit2, isUnsupported); + Byte flags (isSynthetic, isLegacy, nnbdModeBit1, nnbdModeBit2, isUnsupported); UInt languageVersionMajor; UInt languageVersionMinor; CanonicalNameReference canonicalName; @@ -401,7 +401,7 @@ type Field extends Member { FileOffset fileEndOffset; UInt flags (isFinal, isConst, isStatic, isCovariantByDeclaration, isCovariantByClass, isLate, isExtensionMember, - isNonNullableByDefault, isInternalImplementation, + isLegacy, isInternalImplementation, isEnumElement, isExtensionTypeMember); Name name; List annotations; @@ -416,7 +416,7 @@ type Constructor extends Member { FileOffset startFileOffset; // Offset of the start of the constructor including any annotations. FileOffset fileOffset; // Offset of the constructor name. FileOffset fileEndOffset; - Byte flags (isConst, isExternal, isSynthetic, isNonNullableByDefault); + Byte flags (isConst, isExternal, isSynthetic, isLegacy); Name name; List annotations; FunctionNode function; @@ -456,7 +456,7 @@ type Procedure extends Member { Byte kind; // Index into the ProcedureKind enum above. Byte stubKind; // Index into the ProcedureStubKind enum above. UInt flags (isStatic, isAbstract, isExternal, isConst, - isExtensionMember, isNonNullableByDefault, isSynthetic, + isExtensionMember, isLegacy, isSynthetic, isInternalImplementation, isExtensionTypeMember, hasWeakTearoffReferencePragma, IsLoweredLateField); Name name; @@ -990,7 +990,7 @@ type FileUriExpression extends Expression { type IsExpression extends Expression { Byte tag = 37; FileOffset fileOffset; - Byte flags (isForNonNullableByDefault); + Byte flags (isLegacy); Expression operand; DartType type; } diff --git a/pkg/kernel/lib/ast.dart b/pkg/kernel/lib/ast.dart index e8505f8be7f..6b1ba1e6cd2 100644 --- a/pkg/kernel/lib/ast.dart +++ b/pkg/kernel/lib/ast.dart @@ -250,7 +250,7 @@ abstract class Annotatable extends TreeNode { // LIBRARIES and CLASSES // ------------------------------------------------------------------------ -enum NonNullableByDefaultCompiledMode { Weak, Strong, Agnostic, Invalid } +enum NonNullableByDefaultCompiledMode { Strong, Weak, Agnostic, Invalid } class Library extends NamedNode implements Annotatable, Comparable, FileUriNode { @@ -273,7 +273,7 @@ class Library extends NamedNode } static const int SyntheticFlag = 1 << 0; - static const int NonNullableByDefaultFlag = 1 << 1; + static const int LegacyFlag = 1 << 1; static const int NonNullableByDefaultModeBit1 = 1 << 2; static const int NonNullableByDefaultModeBit2 = 1 << 3; static const int IsUnsupportedFlag = 1 << 4; @@ -287,18 +287,16 @@ class Library extends NamedNode flags = value ? (flags | SyntheticFlag) : (flags & ~SyntheticFlag); } - bool get isNonNullableByDefault => (flags & NonNullableByDefaultFlag) != 0; + bool get isNonNullableByDefault => (flags & LegacyFlag) == 0; void set isNonNullableByDefault(bool value) { - flags = value - ? (flags | NonNullableByDefaultFlag) - : (flags & ~NonNullableByDefaultFlag); + flags = value ? (flags & ~LegacyFlag) : (flags | LegacyFlag); } NonNullableByDefaultCompiledMode get nonNullableByDefaultCompiledMode { bool bit1 = (flags & NonNullableByDefaultModeBit1) != 0; bool bit2 = (flags & NonNullableByDefaultModeBit2) != 0; - if (!bit1 && !bit2) return NonNullableByDefaultCompiledMode.Weak; - if (bit1 && !bit2) return NonNullableByDefaultCompiledMode.Strong; + if (!bit1 && !bit2) return NonNullableByDefaultCompiledMode.Strong; + if (bit1 && !bit2) return NonNullableByDefaultCompiledMode.Weak; if (bit1 && bit2) return NonNullableByDefaultCompiledMode.Agnostic; if (!bit1 && bit2) return NonNullableByDefaultCompiledMode.Invalid; throw new StateError("Unused bit-pattern for compilation mode"); @@ -307,11 +305,11 @@ class Library extends NamedNode void set nonNullableByDefaultCompiledMode( NonNullableByDefaultCompiledMode mode) { switch (mode) { - case NonNullableByDefaultCompiledMode.Weak: + case NonNullableByDefaultCompiledMode.Strong: flags = (flags & ~NonNullableByDefaultModeBit1) & ~NonNullableByDefaultModeBit2; break; - case NonNullableByDefaultCompiledMode.Strong: + case NonNullableByDefaultCompiledMode.Weak: flags = (flags | NonNullableByDefaultModeBit1) & ~NonNullableByDefaultModeBit2; break; @@ -2405,7 +2403,7 @@ class Field extends Member { static const int FlagCovariantByClass = 1 << 4; static const int FlagLate = 1 << 5; static const int FlagExtensionMember = 1 << 6; - static const int FlagNonNullableByDefault = 1 << 7; + static const int FlagLegacy = 1 << 7; static const int FlagInternalImplementation = 1 << 8; static const int FlagEnumElement = 1 << 9; static const int FlagExtensionTypeMember = 1 << 10; @@ -2515,12 +2513,10 @@ class Field extends Member { bool get isExternal => false; @override - bool get isNonNullableByDefault => flags & FlagNonNullableByDefault != 0; + bool get isNonNullableByDefault => flags & FlagLegacy == 0; void set isNonNullableByDefault(bool value) { - flags = value - ? (flags | FlagNonNullableByDefault) - : (flags & ~FlagNonNullableByDefault); + flags = value ? (flags & ~FlagLegacy) : (flags | FlagLegacy); } @override @@ -2637,7 +2633,7 @@ class Constructor extends Member { static const int FlagConst = 1 << 0; // Must match serialized bit positions. static const int FlagExternal = 1 << 1; static const int FlagSynthetic = 1 << 2; - static const int FlagNonNullableByDefault = 1 << 3; + static const int FlagLegacy = 1 << 3; @override bool get isConst => flags & FlagConst != 0; @@ -2677,12 +2673,10 @@ class Constructor extends Member { bool get isExtensionTypeMember => false; @override - bool get isNonNullableByDefault => flags & FlagNonNullableByDefault != 0; + bool get isNonNullableByDefault => flags & FlagLegacy == 0; void set isNonNullableByDefault(bool value) { - flags = value - ? (flags | FlagNonNullableByDefault) - : (flags & ~FlagNonNullableByDefault); + flags = value ? (flags & ~FlagLegacy) : (flags | FlagLegacy); } @override @@ -3087,7 +3081,7 @@ class Procedure extends Member implements GenericFunction { static const int FlagExternal = 1 << 2; static const int FlagConst = 1 << 3; // Only for external const factories. static const int FlagExtensionMember = 1 << 4; - static const int FlagNonNullableByDefault = 1 << 5; + static const int FlagLegacy = 1 << 5; static const int FlagSynthetic = 1 << 6; static const int FlagInternalImplementation = 1 << 7; static const int FlagExtensionTypeMember = 1 << 8; @@ -3212,12 +3206,10 @@ class Procedure extends Member implements GenericFunction { bool get isFactory => kind == ProcedureKind.Factory; @override - bool get isNonNullableByDefault => flags & FlagNonNullableByDefault != 0; + bool get isNonNullableByDefault => flags & FlagLegacy == 0; void set isNonNullableByDefault(bool value) { - flags = value - ? (flags | FlagNonNullableByDefault) - : (flags & ~FlagNonNullableByDefault); + flags = value ? (flags & ~FlagLegacy) : (flags | FlagLegacy); } Member? get concreteForwardingStubTarget => @@ -7501,19 +7493,16 @@ class IsExpression extends Expression { } // Must match serialized bit positions. - static const int FlagForNonNullableByDefault = 1 << 0; + static const int FlagForLegacy = 1 << 0; /// If `true`, this test take the nullability of [type] into account. /// /// This is the case for is-tests written in libraries that are opted in to /// the non nullable by default feature. - bool get isForNonNullableByDefault => - flags & FlagForNonNullableByDefault != 0; + bool get isForNonNullableByDefault => flags & FlagForLegacy == 0; void set isForNonNullableByDefault(bool value) { - flags = value - ? (flags | FlagForNonNullableByDefault) - : (flags & ~FlagForNonNullableByDefault); + flags = value ? (flags & ~FlagForLegacy) : (flags | FlagForLegacy); } @override @@ -7583,7 +7572,7 @@ class AsExpression extends Expression { static const int FlagTypeError = 1 << 0; static const int FlagCovarianceCheck = 1 << 1; static const int FlagForDynamic = 1 << 2; - static const int FlagForNonNullableByDefault = 1 << 3; + static const int FlagForLegacy = 1 << 3; static const int FlagUnchecked = 1 << 4; /// If `true`, this test is an implicit down cast. @@ -7633,13 +7622,10 @@ class AsExpression extends Expression { /// /// This is the case for is-tests written in libraries that are opted in to /// the non nullable by default feature. - bool get isForNonNullableByDefault => - flags & FlagForNonNullableByDefault != 0; + bool get isForNonNullableByDefault => flags & FlagForLegacy == 0; void set isForNonNullableByDefault(bool value) { - flags = value - ? (flags | FlagForNonNullableByDefault) - : (flags & ~FlagForNonNullableByDefault); + flags = value ? (flags & ~FlagForLegacy) : (flags | FlagForLegacy); } /// If `true`, this test is added to show the known static type of the @@ -14661,7 +14647,7 @@ class Component extends TreeNode { Reference? get mainMethodName => _mainMethodName; NonNullableByDefaultCompiledMode? _mode; NonNullableByDefaultCompiledMode get mode { - return _mode ?? NonNullableByDefaultCompiledMode.Weak; + return _mode ?? NonNullableByDefaultCompiledMode.Strong; } NonNullableByDefaultCompiledMode? get modeRaw => _mode; diff --git a/pkg/kernel/lib/binary/tag.dart b/pkg/kernel/lib/binary/tag.dart index b639e49dd0e..6a7eef55366 100644 --- a/pkg/kernel/lib/binary/tag.dart +++ b/pkg/kernel/lib/binary/tag.dart @@ -226,7 +226,7 @@ class Tag { /// Internal version of kernel binary format. /// Bump it when making incompatible changes in kernel binaries. /// Keep in sync with runtime/vm/kernel_binary.h, pkg/kernel/binary.md. - static const int BinaryFormatVersion = 116; + static const int BinaryFormatVersion = 117; } abstract class ConstantTag { diff --git a/pkg/kernel/test/binary/lazy_reading_test.dart b/pkg/kernel/test/binary/lazy_reading_test.dart index d3848a68155..9d5708210d0 100644 --- a/pkg/kernel/test/binary/lazy_reading_test.dart +++ b/pkg/kernel/test/binary/lazy_reading_test.dart @@ -32,7 +32,7 @@ void main() { classA.addConstructor(classAConstructor); } Component c = new Component(libraries: [lib]); - c.setMainMethodAndMode(null, false, NonNullableByDefaultCompiledMode.Weak); + c.setMainMethodAndMode(null, false, NonNullableByDefaultCompiledMode.Strong); List loadMe = serializeComponent(c); // Load and make sure we can get at class B from class A (i.e. that it's diff --git a/pkg/kernel/test/class_hierarchy_test.dart b/pkg/kernel/test/class_hierarchy_test.dart index 72d761aa679..ee03c3cd3b7 100644 --- a/pkg/kernel/test/class_hierarchy_test.dart +++ b/pkg/kernel/test/class_hierarchy_test.dart @@ -113,7 +113,7 @@ class A {} component.libraries.add(libWithB); libWithB.addClass(b); _assertLibraryText(libWithB, ''' -library test_b /*isLegacy*/; +library test_b; import self as self; import "test.dart" as test; @@ -1389,7 +1389,7 @@ class B extends self::A {} // Clean up the text a bit. const oftenUsedPrefix = ''' -library test /*isLegacy*/; +library test; import self as self; import "dart:core" as core; diff --git a/pkg/kernel/test/convert_field_to_setter_getter_test.dart b/pkg/kernel/test/convert_field_to_setter_getter_test.dart index d0a2e005bfb..d17147dd714 100644 --- a/pkg/kernel/test/convert_field_to_setter_getter_test.dart +++ b/pkg/kernel/test/convert_field_to_setter_getter_test.dart @@ -186,7 +186,8 @@ void verifyTargets(Procedure libProcedure, Procedure lib2Procedure, List serialize(Library lib1, Library lib2) { Component component = new Component(libraries: [lib1, lib2]) - ..setMainMethodAndMode(null, false, NonNullableByDefaultCompiledMode.Weak); + ..setMainMethodAndMode( + null, false, NonNullableByDefaultCompiledMode.Strong); ByteSink sink = new ByteSink(); new BinaryPrinter(sink).writeComponentFile(component); return sink.builder.takeBytes(); diff --git a/pkg/kernel/test/load_concat_dill_keeps_source_test.dart b/pkg/kernel/test/load_concat_dill_keeps_source_test.dart index fb62f7ec292..5ed31de5dd1 100644 --- a/pkg/kernel/test/load_concat_dill_keeps_source_test.dart +++ b/pkg/kernel/test/load_concat_dill_keeps_source_test.dart @@ -26,7 +26,8 @@ void main() { library2.addProcedure(p2); Component component = new Component(libraries: [library1, library2]) - ..setMainMethodAndMode(null, false, NonNullableByDefaultCompiledMode.Weak); + ..setMainMethodAndMode( + null, false, NonNullableByDefaultCompiledMode.Strong); component.uriToSource[uri1] = new Source([42, 2 * 42], utf8.encode("source #1"), uri1, uri1); component.uriToSource[uri2] = @@ -34,7 +35,7 @@ void main() { expectSource(serialize(component), true, true); Component cPartial1 = new Component(nameRoot: component.root) - ..setMainMethodAndMode(null, false, NonNullableByDefaultCompiledMode.Weak) + ..setMainMethodAndMode(null, false, NonNullableByDefaultCompiledMode.Strong) ..libraries.add(library1); cPartial1.uriToSource[uri1] = new Source([42, 2 * 42], utf8.encode("source #1"), uri1, uri1); @@ -44,7 +45,7 @@ void main() { expectSource(partial1Serialized, true, false); Component cPartial2 = new Component(nameRoot: component.root) - ..setMainMethodAndMode(null, false, NonNullableByDefaultCompiledMode.Weak) + ..setMainMethodAndMode(null, false, NonNullableByDefaultCompiledMode.Strong) ..libraries.add(library2); cPartial2.uriToSource[uri1] = new Source([42, 2 * 42], const [], uri1, uri1); diff --git a/pkg/kernel/test/load_field_and_procedure_overwrites_test.dart b/pkg/kernel/test/load_field_and_procedure_overwrites_test.dart index c9950d51f69..991f4c228b7 100644 --- a/pkg/kernel/test/load_field_and_procedure_overwrites_test.dart +++ b/pkg/kernel/test/load_field_and_procedure_overwrites_test.dart @@ -59,7 +59,8 @@ void expect(dynamic actual, dynamic expected) { List serialize(Library lib1) { Component component = new Component(libraries: [lib1]) - ..setMainMethodAndMode(null, false, NonNullableByDefaultCompiledMode.Weak); + ..setMainMethodAndMode( + null, false, NonNullableByDefaultCompiledMode.Strong); ByteSink sink = new ByteSink(); new BinaryPrinter(sink).writeComponentFile(component); return sink.builder.takeBytes(); diff --git a/pkg/kernel/test/relink_test.dart b/pkg/kernel/test/relink_test.dart index adbaf8f56a2..55578fb9a14 100644 --- a/pkg/kernel/test/relink_test.dart +++ b/pkg/kernel/test/relink_test.dart @@ -196,5 +196,6 @@ Component createComponent(int literal) { fileUri: mainUri); main.addProcedure(mainProcedure); return new Component(libraries: [main, lib]) - ..setMainMethodAndMode(null, false, NonNullableByDefaultCompiledMode.Weak); + ..setMainMethodAndMode( + null, false, NonNullableByDefaultCompiledMode.Strong); } diff --git a/pkg/test_runner/lib/src/compiler_configuration.dart b/pkg/test_runner/lib/src/compiler_configuration.dart index 5223a5ebc8c..c35f2bd8736 100644 --- a/pkg/test_runner/lib/src/compiler_configuration.dart +++ b/pkg/test_runner/lib/src/compiler_configuration.dart @@ -1553,8 +1553,8 @@ class FastaCompilerConfiguration extends CompilerConfiguration { ...options, ..._configuration.sharedOptions, ..._experimentsArgument(_configuration, testFile), - if (_configuration.configuration.nnbdMode == NnbdMode.strong) ...[ - "--nnbd-strong" + if (_configuration.configuration.nnbdMode == NnbdMode.weak) ...[ + "--nnbd-weak" ] ]; for (var argument in args) { diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/ffi_struct_constructors.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/ffi_struct_constructors.dart.expect index 0bc311282d4..bbddac54d96 100644 --- a/pkg/vm/testcases/transformations/type_flow/transformer/ffi_struct_constructors.dart.expect +++ b/pkg/vm/testcases/transformations/type_flow/transformer/ffi_struct_constructors.dart.expect @@ -59,10 +59,10 @@ final class Struct12 extends ffi::Struct { } [@vm.inferred-type.metadata=dart.ffi::Pointer] -static final field ffi::Pointer> _#ffiCallback0 = [@vm.inferred-type.metadata=dart.ffi::Pointer] ffi::_createNativeCallableIsolateLocal>(ffi::_nativeCallbackFunction<(self::Struct3) → ffi::Int32>(#C15, 0), null, false)/*isLegacy*/; +static final field ffi::Pointer> _#ffiCallback0 = [@vm.inferred-type.metadata=dart.ffi::Pointer] ffi::_createNativeCallableIsolateLocal>(ffi::_nativeCallbackFunction<(self::Struct3) → ffi::Int32>(#C15, 0), null, false); [@vm.inferred-type.metadata=dart.ffi::Pointer] -static final field ffi::Pointer> _#ffiCallback1 = [@vm.inferred-type.metadata=dart.ffi::Pointer] ffi::_createNativeCallableIsolateLocal>(ffi::_nativeCallbackFunction<() → self::Struct7>(#C16, null), null, false)/*isLegacy*/; +static final field ffi::Pointer> _#ffiCallback1 = [@vm.inferred-type.metadata=dart.ffi::Pointer] ffi::_createNativeCallableIsolateLocal>(ffi::_nativeCallbackFunction<() → self::Struct7>(#C16, null), null, false); static method main() → void { self::testLookupFunctionReturn(); self::testLookupFunctionArgument(); diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_set_field.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_set_field.dart.expect index 81112cf8213..f912c51abe9 100644 --- a/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_set_field.dart.expect +++ b/pkg/vm/testcases/transformations/type_flow/transformer/invalidation_set_field.dart.expect @@ -19,7 +19,7 @@ class A extends core::Object { ; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1] - set /*isLegacy*/ field2(synthesized dynamic value) → void; + set field2(synthesized dynamic value) → void; } class DeepCaller1 extends core::Object { synthetic constructor •() → self::DeepCaller1 diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/regress_41452.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/regress_41452.dart.expect index 1ce51c8344c..55551193171 100644 --- a/pkg/vm/testcases/transformations/type_flow/transformer/regress_41452.dart.expect +++ b/pkg/vm/testcases/transformations/type_flow/transformer/regress_41452.dart.expect @@ -29,7 +29,7 @@ abstract class _SplayTree extends self::_SplayTree> { diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/regress_45324_2.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/regress_45324_2.dart.expect index dcefdf16864..85a79b08d50 100644 --- a/pkg/vm/testcases/transformations/type_flow/transformer/regress_45324_2.dart.expect +++ b/pkg/vm/testcases/transformations/type_flow/transformer/regress_45324_2.dart.expect @@ -18,7 +18,7 @@ class Z extends core::Object { ; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,getterSelectorId:3] - abstract get /*isLegacy*/ appName() → core::String?; + abstract get appName() → core::String?; } class X extends self::Base implements self::Z { synthetic constructor •() → self::X diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/tree_shake_enum_from_lib.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/tree_shake_enum_from_lib.dart.expect index 2961a8aa5e2..97ba4207add 100644 --- a/pkg/vm/testcases/transformations/type_flow/transformer/tree_shake_enum_from_lib.dart.expect +++ b/pkg/vm/testcases/transformations/type_flow/transformer/tree_shake_enum_from_lib.dart.expect @@ -17,10 +17,10 @@ class UsedEnum extends core::_Enum /*isEnum*/ { abstract class UnusedInterface extends core::Object { [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] - abstract get /*isLegacy*/ usedInterfaceField() → core::int?; + abstract get usedInterfaceField() → core::int?; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] - abstract set /*isLegacy*/ usedInterfaceField(synthesized core::int? value) → void; + abstract set usedInterfaceField(synthesized core::int? value) → void; } class UsedClass extends core::Object implements self::UnusedInterface { diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/tree_shake_field.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/tree_shake_field.dart.expect index 99ff3e722ec..53debc64c8a 100644 --- a/pkg/vm/testcases/transformations/type_flow/transformer/tree_shake_field.dart.expect +++ b/pkg/vm/testcases/transformations/type_flow/transformer/tree_shake_field.dart.expect @@ -19,7 +19,7 @@ class Class extends core::Object implements lib::Interface { ; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5] - set /*isLegacy*/ field2(synthesized core::int? value) → void; + set field2(synthesized core::int? value) → void; } static method method([@vm.inferred-arg-type.metadata=#lib::Class] lib::Interface i) → void { [@vm.direct-call.metadata=#lib::Class.field2] [@vm.inferred-type.metadata=!? (skip check)] i.{lib::Interface::field2} = [@vm.direct-call.metadata=#lib::Class.field1] [@vm.inferred-type.metadata=dart.core::Null? (value: null)] i.{lib::Interface::field1}{core::int?}; @@ -35,14 +35,14 @@ import "dart:core" as core; abstract class Interface extends core::Object { [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,getterSelectorId:2] - abstract get /*isLegacy*/ field1() → core::int?; + abstract get field1() → core::int?; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5] - abstract set /*isLegacy*/ field2(synthesized core::int? value) → void; + abstract set field2(synthesized core::int? value) → void; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] - abstract get /*isLegacy*/ field3() → core::int?; + abstract get field3() → core::int?; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] - abstract set /*isLegacy*/ field3(synthesized core::int? value) → void; + abstract set field3(synthesized core::int? value) → void; } diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/tree_shake_field_linked.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/tree_shake_field_linked.dart.expect index 99ff3e722ec..53debc64c8a 100644 --- a/pkg/vm/testcases/transformations/type_flow/transformer/tree_shake_field_linked.dart.expect +++ b/pkg/vm/testcases/transformations/type_flow/transformer/tree_shake_field_linked.dart.expect @@ -19,7 +19,7 @@ class Class extends core::Object implements lib::Interface { ; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5] - set /*isLegacy*/ field2(synthesized core::int? value) → void; + set field2(synthesized core::int? value) → void; } static method method([@vm.inferred-arg-type.metadata=#lib::Class] lib::Interface i) → void { [@vm.direct-call.metadata=#lib::Class.field2] [@vm.inferred-type.metadata=!? (skip check)] i.{lib::Interface::field2} = [@vm.direct-call.metadata=#lib::Class.field1] [@vm.inferred-type.metadata=dart.core::Null? (value: null)] i.{lib::Interface::field1}{core::int?}; @@ -35,14 +35,14 @@ import "dart:core" as core; abstract class Interface extends core::Object { [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,getterSelectorId:2] - abstract get /*isLegacy*/ field1() → core::int?; + abstract get field1() → core::int?; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:5] - abstract set /*isLegacy*/ field2(synthesized core::int? value) → void; + abstract set field2(synthesized core::int? value) → void; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] - abstract get /*isLegacy*/ field3() → core::int?; + abstract get field3() → core::int?; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3,getterSelectorId:4] - abstract set /*isLegacy*/ field3(synthesized core::int? value) → void; + abstract set field3(synthesized core::int? value) → void; } diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_getters.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_getters.dart.expect index ff753a8696e..b9c61c7acec 100644 --- a/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_getters.dart.expect +++ b/pkg/vm/testcases/transformations/type_flow/transformer/unboxed_getters.dart.expect @@ -85,7 +85,7 @@ abstract class UBI extends core::Object { [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,getterSelectorId:5] [@vm.unboxing-info.metadata=()->i] - abstract get /*isLegacy*/ value() → core::int?; + abstract get value() → core::int?; } class UBIA extends core::Object implements self::UBI { diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field.dart.expect index 28a8b78ce76..d14063fe6bc 100644 --- a/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field.dart.expect +++ b/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field.dart.expect @@ -16,7 +16,7 @@ class C extends core::Object { ; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1] - set /*isLegacy*/ instanceField(synthesized self::B? value) → void; + set instanceField(synthesized self::B? value) → void; } static method main() → void { null; diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field2.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field2.dart.expect index 47e5fb8562c..389d707943b 100644 --- a/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field2.dart.expect +++ b/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field2.dart.expect @@ -18,7 +18,7 @@ class B extends core::Object { abstract class C extends core::Object { [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1] - abstract set /*isLegacy*/ bar(covariant-by-class synthesized self::C::T? value) → void; + abstract set bar(covariant-by-class synthesized self::C::T? value) → void; } class D extends core::Object implements self::C { synthetic constructor •() → self::D @@ -26,13 +26,13 @@ class D extends core::Object implements self::C { ; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:1] - set /*isLegacy*/ bar(covariant-by-class synthesized core::int? value) → void; + set bar(covariant-by-class synthesized core::int? value) → void; } abstract class E extends core::Object { [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false,getterSelectorId:2] [@vm.unboxing-info.metadata=()->i] - abstract get /*isLegacy*/ bar() → core::int; + abstract get bar() → core::int; } class F extends core::Object implements self::E { synthetic constructor •() → self::F @@ -57,7 +57,7 @@ abstract class H extends core::Object { ; [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:4] - set /*isLegacy*/ unused6(synthesized core::int? value) → void; + set unused6(synthesized core::int? value) → void; } class I extends self::H { synthetic constructor •() → self::I diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field3.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field3.dart.expect index 7c0a1e9e8d1..dc5880b5a97 100644 --- a/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field3.dart.expect +++ b/pkg/vm/testcases/transformations/type_flow/transformer/write_only_field3.dart.expect @@ -13,7 +13,7 @@ class A extends core::Object { } [@vm.procedure-attributes.metadata=methodOrSetterCalledDynamically:false,getterCalledDynamically:false,hasNonThisUses:false,hasTearOffUses:false,methodOrSetterSelectorId:3] - set /*isLegacy*/ x(synthesized core::int value) → void; + set x(synthesized core::int value) → void; } class B extends core::Object { diff --git a/runtime/vm/compiler/frontend/kernel_translation_helper.h b/runtime/vm/compiler/frontend/kernel_translation_helper.h index c6553b30f4b..2ca64f57e92 100644 --- a/runtime/vm/compiler/frontend/kernel_translation_helper.h +++ b/runtime/vm/compiler/frontend/kernel_translation_helper.h @@ -494,7 +494,7 @@ class FieldHelper { kIsGenericCovariantImpl = 1 << 4, kIsLate = 1 << 5, kExtensionMember = 1 << 6, - kNonNullableByDefault = 1 << 7, + kLegacy = 1 << 7, kInternalImplementation = 1 << 8, kEnumElement = 1 << 9, kExtensionTypeMember = 1 << 10, @@ -594,7 +594,7 @@ class ProcedureHelper { kExternal = 1 << 2, kConst = 1 << 3, // Only for external const factories. kExtensionMember = 1 << 4, - kIsNonNullableByDefault = 1 << 5, + kIsLegacy = 1 << 5, kSyntheticProcedure = 1 << 6, kInternalImplementation = 1 << 7, kExtensionTypeMember = 1 << 8, @@ -848,7 +848,7 @@ class LibraryHelper { enum Flag { kSynthetic = 1 << 0, - kIsNonNullableByDefault = 1 << 1, + kIsLegacy = 1 << 1, kNonNullableByDefaultCompiledModeBit1 = 1 << 2, kNonNullableByDefaultCompiledModeBit2 = 1 << 3, kUnsupported = 1 << 4, @@ -867,14 +867,12 @@ class LibraryHelper { void SetJustRead(Field field) { next_read_ = field + 1; } bool IsSynthetic() const { return (flags_ & kSynthetic) != 0; } - bool IsNonNullableByDefault() const { - return (flags_ & kIsNonNullableByDefault) != 0; - } + bool IsNonNullableByDefault() const { return (flags_ & kIsLegacy) == 0; } NNBDCompiledMode GetNonNullableByDefaultCompiledMode() const { bool bit1 = (flags_ & kNonNullableByDefaultCompiledModeBit1) != 0; bool bit2 = (flags_ & kNonNullableByDefaultCompiledModeBit2) != 0; - if (!bit1 && !bit2) return NNBDCompiledMode::kWeak; - if (bit1 && !bit2) return NNBDCompiledMode::kStrong; + if (!bit1 && !bit2) return NNBDCompiledMode::kStrong; + if (bit1 && !bit2) return NNBDCompiledMode::kWeak; if (bit1 && bit2) return NNBDCompiledMode::kAgnostic; if (!bit1 && bit2) return NNBDCompiledMode::kInvalid; UNREACHABLE(); diff --git a/runtime/vm/compiler/recognized_methods_list.h b/runtime/vm/compiler/recognized_methods_list.h index 491903ee18d..d8773492baf 100644 --- a/runtime/vm/compiler/recognized_methods_list.h +++ b/runtime/vm/compiler/recognized_methods_list.h @@ -12,489 +12,489 @@ namespace dart { // When adding a new function, add a 0 as the fingerprint and run the build in // debug mode to get the correct fingerprint from the mismatch error. #define OTHER_RECOGNIZED_LIST(V) \ - V(::, identical, ObjectIdentical, 0x0407f735) \ - V(ClassID, getID, ClassIDgetID, 0xdc7cfcaa) \ - V(Object, Object., ObjectConstructor, 0xab6d6cfa) \ - V(_Array, [], ObjectArrayGetIndexed, 0x78e66c72) \ - V(_GrowableList, [], GrowableArrayGetIndexed, 0x78e66c72) \ - V(_Int8List, [], Int8ArrayGetIndexed, 0x2321c262) \ - V(_ExternalInt8Array, [], ExternalInt8ArrayGetIndexed, 0x2321c262) \ - V(_Uint8List, [], Uint8ArrayGetIndexed, 0x2321c262) \ - V(_ExternalUint8Array, [], ExternalUint8ArrayGetIndexed, 0x2321c262) \ - V(_Uint8ClampedList, [], Uint8ClampedArrayGetIndexed, 0x2321c262) \ + V(::, identical, ObjectIdentical, 0x03f96b55) \ + V(ClassID, getID, ClassIDgetID, 0xdc6e70ca) \ + V(Object, Object., ObjectConstructor, 0xab6d6cf2) \ + V(_Array, [], ObjectArrayGetIndexed, 0x78d7e092) \ + V(_GrowableList, [], GrowableArrayGetIndexed, 0x78d7e092) \ + V(_Int8List, [], Int8ArrayGetIndexed, 0x23133682) \ + V(_ExternalInt8Array, [], ExternalInt8ArrayGetIndexed, 0x23133682) \ + V(_Uint8List, [], Uint8ArrayGetIndexed, 0x23133682) \ + V(_ExternalUint8Array, [], ExternalUint8ArrayGetIndexed, 0x23133682) \ + V(_Uint8ClampedList, [], Uint8ClampedArrayGetIndexed, 0x23133682) \ V(_ExternalUint8ClampedArray, [], ExternalUint8ClampedArrayGetIndexed, \ - 0x2321c262) \ - V(_Int16List, [], Int16ArrayGetIndexed, 0x2321c262) \ - V(_ExternalInt16Array, [], ExternalInt16ArrayGetIndexed, 0x2321c262) \ - V(_Uint16List, [], Uint16ArrayGetIndexed, 0x2321c262) \ - V(_ExternalUint16Array, [], ExternalUint16ArrayGetIndexed, 0x2321c262) \ - V(_Int32List, [], Int32ArrayGetIndexed, 0x2321bea1) \ - V(_ExternalInt32Array, [], ExternalInt32ArrayGetIndexed, 0x2321bea1) \ - V(_Uint32List, [], Uint32ArrayGetIndexed, 0x2321bea1) \ - V(_ExternalUint32Array, [], ExternalUint32ArrayGetIndexed, 0x2321bea1) \ - V(_Int64List, [], Int64ArrayGetIndexed, 0x2321bea1) \ - V(_ExternalInt64Array, [], ExternalInt64ArrayGetIndexed, 0x2321bea1) \ - V(_Uint64List, [], Uint64ArrayGetIndexed, 0x2321bea1) \ - V(_ExternalUint64Array, [], ExternalUint64ArrayGetIndexed, 0x2321bea1) \ - V(_Float32List, [], Float32ArrayGetIndexed, 0x0784da3c) \ - V(_ExternalFloat32Array, [], ExternalFloat32ArrayGetIndexed, 0x0784da3c) \ - V(_Float64List, [], Float64ArrayGetIndexed, 0x0784da3c) \ - V(_ExternalFloat64Array, [], ExternalFloat64ArrayGetIndexed, 0x0784da3c) \ - V(_Float32x4List, [], Float32x4ArrayGetIndexed, 0xb0f79623) \ - V(_ExternalFloat32x4Array, [], ExternalFloat32x4ArrayGetIndexed, 0xb0f79623) \ - V(_Float64x2List, [], Float64x2ArrayGetIndexed, 0x5fd5df39) \ - V(_ExternalFloat64x2Array, [], ExternalFloat64x2ArrayGetIndexed, 0x5fd5df39) \ - V(_Int32x4List, [], Int32x4ArrayGetIndexed, 0x4967f00b) \ - V(_ExternalInt32x4Array, [], ExternalInt32x4ArrayGetIndexed, 0x4967f00b) \ - V(_List, ., ObjectArrayAllocate, 0x4c8eae02) \ - V(_List, []=, ObjectArraySetIndexed, 0x3a3252da) \ - V(_GrowableList, ._withData, GrowableArrayAllocateWithData, 0x19394cc1) \ - V(_GrowableList, []=, GrowableArraySetIndexed, 0x3a3252da) \ - V(_Record, get:_fieldNames, Record_fieldNames, 0x68d6bd7e) \ - V(_Record, get:_numFields, Record_numFields, 0x7bb37f73) \ - V(_Record, get:_shape, Record_shape, 0x70d29513) \ - V(_Record, _fieldAt, Record_fieldAt, 0xb48e2c93) \ - V(_TypedList, _getInt8, TypedList_GetInt8, 0x16155415) \ - V(_TypedList, _getUint8, TypedList_GetUint8, 0x1771760b) \ - V(_TypedList, _getInt16, TypedList_GetInt16, 0x2e320e30) \ - V(_TypedList, _getUint16, TypedList_GetUint16, 0x2fb36e9a) \ - V(_TypedList, _getInt32, TypedList_GetInt32, 0x1909a4eb) \ - V(_TypedList, _getUint32, TypedList_GetUint32, 0x194ee65c) \ - V(_TypedList, _getInt64, TypedList_GetInt64, 0xf65237e0) \ - V(_TypedList, _getUint64, TypedList_GetUint64, 0x2c4cf13a) \ - V(_TypedList, _getFloat32, TypedList_GetFloat32, 0xe8e818e8) \ - V(_TypedList, _getFloat64, TypedList_GetFloat64, 0xf81bae15) \ - V(_TypedList, _getFloat32x4, TypedList_GetFloat32x4, 0xaf1e84c6) \ - V(_TypedList, _getFloat64x2, TypedList_GetFloat64x2, 0x544ea4a1) \ - V(_TypedList, _getInt32x4, TypedList_GetInt32x4, 0x5564ebec) \ - V(_TypedList, _setInt8, TypedList_SetInt8, 0xe17abb83) \ - V(_TypedList, _setUint8, TypedList_SetUint8, 0xaf4b2f29) \ - V(_TypedList, _setInt16, TypedList_SetInt16, 0xbad7b808) \ - V(_TypedList, _setUint16, TypedList_SetUint16, 0xce13c030) \ - V(_TypedList, _setInt32, TypedList_SetInt32, 0xbdcc2321) \ - V(_TypedList, _setUint32, TypedList_SetUint32, 0xb9581b93) \ - V(_TypedList, _setInt64, TypedList_SetInt64, 0xc8bec75b) \ - V(_TypedList, _setUint64, TypedList_SetUint64, 0xda38a9e6) \ - V(_TypedList, _setFloat32, TypedList_SetFloat32, 0x2f27a5c1) \ - V(_TypedList, _setFloat64, TypedList_SetFloat64, 0x234b70b3) \ - V(_TypedList, _setFloat32x4, TypedList_SetFloat32x4, 0x38b7a13b) \ - V(_TypedList, _setFloat64x2, TypedList_SetFloat64x2, 0xbadc4f20) \ - V(_TypedList, _setInt32x4, TypedList_SetInt32x4, 0x5cda7a3c) \ - V(ByteData, ., ByteDataFactory, 0x45e89423) \ - V(_ByteDataView, get:offsetInBytes, ByteDataViewOffsetInBytes, 0x60c0664c) \ - V(_ByteDataView, get:_typedData, ByteDataViewTypedData, 0xb9c2d41a) \ - V(_TypedListView, get:offsetInBytes, TypedDataViewOffsetInBytes, 0x60c0664c) \ - V(_TypedListView, get:_typedData, TypedDataViewTypedData, 0xb9c2d41a) \ - V(_ByteDataView, ._, TypedData_ByteDataView_factory, 0x31788b5d) \ - V(_Int8ArrayView, ._, TypedData_Int8ArrayView_factory, 0x444789ab) \ - V(_Uint8ArrayView, ._, TypedData_Uint8ArrayView_factory, 0x95f20076) \ + 0x23133682) \ + V(_Int16List, [], Int16ArrayGetIndexed, 0x23133682) \ + V(_ExternalInt16Array, [], ExternalInt16ArrayGetIndexed, 0x23133682) \ + V(_Uint16List, [], Uint16ArrayGetIndexed, 0x23133682) \ + V(_ExternalUint16Array, [], ExternalUint16ArrayGetIndexed, 0x23133682) \ + V(_Int32List, [], Int32ArrayGetIndexed, 0x231332c1) \ + V(_ExternalInt32Array, [], ExternalInt32ArrayGetIndexed, 0x231332c1) \ + V(_Uint32List, [], Uint32ArrayGetIndexed, 0x231332c1) \ + V(_ExternalUint32Array, [], ExternalUint32ArrayGetIndexed, 0x231332c1) \ + V(_Int64List, [], Int64ArrayGetIndexed, 0x231332c1) \ + V(_ExternalInt64Array, [], ExternalInt64ArrayGetIndexed, 0x231332c1) \ + V(_Uint64List, [], Uint64ArrayGetIndexed, 0x231332c1) \ + V(_ExternalUint64Array, [], ExternalUint64ArrayGetIndexed, 0x231332c1) \ + V(_Float32List, [], Float32ArrayGetIndexed, 0x07764e5c) \ + V(_ExternalFloat32Array, [], ExternalFloat32ArrayGetIndexed, 0x07764e5c) \ + V(_Float64List, [], Float64ArrayGetIndexed, 0x07764e5c) \ + V(_ExternalFloat64Array, [], ExternalFloat64ArrayGetIndexed, 0x07764e5c) \ + V(_Float32x4List, [], Float32x4ArrayGetIndexed, 0xb0e90a43) \ + V(_ExternalFloat32x4Array, [], ExternalFloat32x4ArrayGetIndexed, 0xb0e90a43) \ + V(_Float64x2List, [], Float64x2ArrayGetIndexed, 0x5fc75359) \ + V(_ExternalFloat64x2Array, [], ExternalFloat64x2ArrayGetIndexed, 0x5fc75359) \ + V(_Int32x4List, [], Int32x4ArrayGetIndexed, 0x4959642b) \ + V(_ExternalInt32x4Array, [], ExternalInt32x4ArrayGetIndexed, 0x4959642b) \ + V(_List, ., ObjectArrayAllocate, 0x4c802222) \ + V(_List, []=, ObjectArraySetIndexed, 0x3a23c6fa) \ + V(_GrowableList, ._withData, GrowableArrayAllocateWithData, 0x192ac0e1) \ + V(_GrowableList, []=, GrowableArraySetIndexed, 0x3a23c6fa) \ + V(_Record, get:_fieldNames, Record_fieldNames, 0x68c8319e) \ + V(_Record, get:_numFields, Record_numFields, 0x7ba4f393) \ + V(_Record, get:_shape, Record_shape, 0x70c40933) \ + V(_Record, _fieldAt, Record_fieldAt, 0xb47fa0b3) \ + V(_TypedList, _getInt8, TypedList_GetInt8, 0x1606c835) \ + V(_TypedList, _getUint8, TypedList_GetUint8, 0x1762ea2b) \ + V(_TypedList, _getInt16, TypedList_GetInt16, 0x2e238250) \ + V(_TypedList, _getUint16, TypedList_GetUint16, 0x2fa4e2ba) \ + V(_TypedList, _getInt32, TypedList_GetInt32, 0x18fb190b) \ + V(_TypedList, _getUint32, TypedList_GetUint32, 0x19405a7c) \ + V(_TypedList, _getInt64, TypedList_GetInt64, 0xf643ac00) \ + V(_TypedList, _getUint64, TypedList_GetUint64, 0x2c3e655a) \ + V(_TypedList, _getFloat32, TypedList_GetFloat32, 0xe8d98d08) \ + V(_TypedList, _getFloat64, TypedList_GetFloat64, 0xf80d2235) \ + V(_TypedList, _getFloat32x4, TypedList_GetFloat32x4, 0xaf0ff8e6) \ + V(_TypedList, _getFloat64x2, TypedList_GetFloat64x2, 0x544018c1) \ + V(_TypedList, _getInt32x4, TypedList_GetInt32x4, 0x5556600c) \ + V(_TypedList, _setInt8, TypedList_SetInt8, 0xe16c2fa3) \ + V(_TypedList, _setUint8, TypedList_SetUint8, 0xaf3ca349) \ + V(_TypedList, _setInt16, TypedList_SetInt16, 0xbac92c28) \ + V(_TypedList, _setUint16, TypedList_SetUint16, 0xce053450) \ + V(_TypedList, _setInt32, TypedList_SetInt32, 0xbdbd9741) \ + V(_TypedList, _setUint32, TypedList_SetUint32, 0xb9498fb3) \ + V(_TypedList, _setInt64, TypedList_SetInt64, 0xc8b03b7b) \ + V(_TypedList, _setUint64, TypedList_SetUint64, 0xda2a1e06) \ + V(_TypedList, _setFloat32, TypedList_SetFloat32, 0x2f1919e1) \ + V(_TypedList, _setFloat64, TypedList_SetFloat64, 0x233ce4d3) \ + V(_TypedList, _setFloat32x4, TypedList_SetFloat32x4, 0x38a9155b) \ + V(_TypedList, _setFloat64x2, TypedList_SetFloat64x2, 0xbacdc340) \ + V(_TypedList, _setInt32x4, TypedList_SetInt32x4, 0x5ccbee5c) \ + V(ByteData, ., ByteDataFactory, 0x0f140a3b) \ + V(_ByteDataView, get:offsetInBytes, ByteDataViewOffsetInBytes, 0x60b1da6c) \ + V(_ByteDataView, get:_typedData, ByteDataViewTypedData, 0xb9b4483a) \ + V(_TypedListView, get:offsetInBytes, TypedDataViewOffsetInBytes, 0x60b1da6c) \ + V(_TypedListView, get:_typedData, TypedDataViewTypedData, 0xb9b4483a) \ + V(_ByteDataView, ._, TypedData_ByteDataView_factory, 0x3169ff7d) \ + V(_Int8ArrayView, ._, TypedData_Int8ArrayView_factory, 0x4438fdcb) \ + V(_Uint8ArrayView, ._, TypedData_Uint8ArrayView_factory, 0x95e37496) \ V(_Uint8ClampedArrayView, ._, TypedData_Uint8ClampedArrayView_factory, \ - 0x052af04a) \ - V(_Int16ArrayView, ._, TypedData_Int16ArrayView_factory, 0x48ff8bbc) \ - V(_Uint16ArrayView, ._, TypedData_Uint16ArrayView_factory, 0x9fea3e13) \ - V(_Int32ArrayView, ._, TypedData_Int32ArrayView_factory, 0xe2db225a) \ - V(_Uint32ArrayView, ._, TypedData_Uint32ArrayView_factory, 0x86743282) \ - V(_Int64ArrayView, ._, TypedData_Int64ArrayView_factory, 0x12b8c690) \ - V(_Uint64ArrayView, ._, TypedData_Uint64ArrayView_factory, 0x25b7e6de) \ - V(_Float32ArrayView, ._, TypedData_Float32ArrayView_factory, 0xdc880425) \ - V(_Float64ArrayView, ._, TypedData_Float64ArrayView_factory, 0xcb67ccf8) \ - V(_Float32x4ArrayView, ._, TypedData_Float32x4ArrayView_factory, 0x665026a1) \ - V(_Int32x4ArrayView, ._, TypedData_Int32x4ArrayView_factory, 0x04a1d4e6) \ - V(_Float64x2ArrayView, ._, TypedData_Float64x2ArrayView_factory, 0x42d3d385) \ + 0x051c646a) \ + V(_Int16ArrayView, ._, TypedData_Int16ArrayView_factory, 0x48f0ffdc) \ + V(_Uint16ArrayView, ._, TypedData_Uint16ArrayView_factory, 0x9fdbb233) \ + V(_Int32ArrayView, ._, TypedData_Int32ArrayView_factory, 0xe2cc967a) \ + V(_Uint32ArrayView, ._, TypedData_Uint32ArrayView_factory, 0x8665a6a2) \ + V(_Int64ArrayView, ._, TypedData_Int64ArrayView_factory, 0x12aa3ab0) \ + V(_Uint64ArrayView, ._, TypedData_Uint64ArrayView_factory, 0x25a95afe) \ + V(_Float32ArrayView, ._, TypedData_Float32ArrayView_factory, 0xdc797845) \ + V(_Float64ArrayView, ._, TypedData_Float64ArrayView_factory, 0xcb594118) \ + V(_Float32x4ArrayView, ._, TypedData_Float32x4ArrayView_factory, 0x66419ac1) \ + V(_Int32x4ArrayView, ._, TypedData_Int32x4ArrayView_factory, 0x04934906) \ + V(_Float64x2ArrayView, ._, TypedData_Float64x2ArrayView_factory, 0x42c547a5) \ V(_UnmodifiableByteDataView, ._, \ - TypedData_UnmodifiableByteDataView_factory, 0x9aef8fec) \ + TypedData_UnmodifiableByteDataView_factory, 0x9ae1040c) \ V(_UnmodifiableInt8ArrayView, ._, \ - TypedData_UnmodifiableInt8ArrayView_factory, 0x4f1cbd6b) \ + TypedData_UnmodifiableInt8ArrayView_factory, 0x4f0e318b) \ V(_UnmodifiableUint8ArrayView, ._, \ - TypedData_UnmodifiableUint8ArrayView_factory, 0x443a082a) \ + TypedData_UnmodifiableUint8ArrayView_factory, 0x442b7c4a) \ V(_UnmodifiableUint8ClampedArrayView, ._, \ - TypedData_UnmodifiableUint8ClampedArrayView_factory, 0x6a4a68ee) \ + TypedData_UnmodifiableUint8ClampedArrayView_factory, 0x6a3bdd0e) \ V(_UnmodifiableInt16ArrayView, ._, \ - TypedData_UnmodifiableInt16ArrayView_factory, 0xb6d9a51b) \ + TypedData_UnmodifiableInt16ArrayView_factory, 0xb6cb193b) \ V(_UnmodifiableUint16ArrayView, ._, \ - TypedData_UnmodifiableUint16ArrayView_factory, 0xa6cd2fb7) \ + TypedData_UnmodifiableUint16ArrayView_factory, 0xa6bea3d7) \ V(_UnmodifiableInt32ArrayView, ._, \ - TypedData_UnmodifiableInt32ArrayView_factory, 0x48eef2c5) \ + TypedData_UnmodifiableInt32ArrayView_factory, 0x48e066e5) \ V(_UnmodifiableUint32ArrayView, ._, \ - TypedData_UnmodifiableUint32ArrayView_factory, 0x95172e55) \ + TypedData_UnmodifiableUint32ArrayView_factory, 0x9508a275) \ V(_UnmodifiableInt64ArrayView, ._, \ - TypedData_UnmodifiableInt64ArrayView_factory, 0x76444d25) \ + TypedData_UnmodifiableInt64ArrayView_factory, 0x7635c145) \ V(_UnmodifiableUint64ArrayView, ._, \ - TypedData_UnmodifiableUint64ArrayView_factory, 0x400d4563) \ + TypedData_UnmodifiableUint64ArrayView_factory, 0x3ffeb983) \ V(_UnmodifiableFloat32ArrayView, ._, \ - TypedData_UnmodifiableFloat32ArrayView_factory, 0x54157b6a) \ + TypedData_UnmodifiableFloat32ArrayView_factory, 0x5406ef8a) \ V(_UnmodifiableFloat64ArrayView, ._, \ - TypedData_UnmodifiableFloat64ArrayView_factory, 0xbf7b644c) \ + TypedData_UnmodifiableFloat64ArrayView_factory, 0xbf6cd86c) \ V(_UnmodifiableFloat32x4ArrayView, ._, \ - TypedData_UnmodifiableFloat32x4ArrayView_factory, 0x5f17627b) \ + TypedData_UnmodifiableFloat32x4ArrayView_factory, 0x5f08d69b) \ V(_UnmodifiableInt32x4ArrayView, ._, \ - TypedData_UnmodifiableInt32x4ArrayView_factory, 0xf66c6993) \ + TypedData_UnmodifiableInt32x4ArrayView_factory, 0xf65dddb3) \ V(_UnmodifiableFloat64x2ArrayView, ._, \ - TypedData_UnmodifiableFloat64x2ArrayView_factory, 0x6d9ae5fb) \ - V(Int8List, ., TypedData_Int8Array_factory, 0x65ff48e7) \ - V(Uint8List, ., TypedData_Uint8Array_factory, 0xedd566ae) \ - V(Uint8ClampedList, ., TypedData_Uint8ClampedArray_factory, 0x27f7a7b4) \ - V(Int16List, ., TypedData_Int16Array_factory, 0xd0bf0952) \ - V(Uint16List, ., TypedData_Uint16Array_factory, 0x3ca76bc9) \ - V(Int32List, ., TypedData_Int32Array_factory, 0x1b81637f) \ - V(Uint32List, ., TypedData_Uint32Array_factory, 0x2b210aea) \ - V(Int64List, ., TypedData_Int64Array_factory, 0xfb634e8e) \ - V(Uint64List, ., TypedData_Uint64Array_factory, 0xe3c14057) \ - V(Float32List, ., TypedData_Float32Array_factory, 0xa381d95d) \ - V(Float64List, ., TypedData_Float64Array_factory, 0xa0b7bef0) \ - V(Float32x4List, ., TypedData_Float32x4Array_factory, 0x0a6eebe7) \ - V(Int32x4List, ., TypedData_Int32x4Array_factory, 0x5a0924cd) \ - V(Float64x2List, ., TypedData_Float64x2Array_factory, 0xecbc6fc9) \ - V(_TypedListBase, _memMove1, TypedData_memMove1, 0xd2767fb0) \ - V(_TypedListBase, _memMove2, TypedData_memMove2, 0xed382bb6) \ - V(_TypedListBase, _memMove4, TypedData_memMove4, 0xcfe37726) \ - V(_TypedListBase, _memMove8, TypedData_memMove8, 0xd1d8e325) \ - V(_TypedListBase, _memMove16, TypedData_memMove16, 0x07861cd5) \ - V(::, _typedDataIndexCheck, TypedDataIndexCheck, 0x79215a89) \ - V(::, _byteDataByteOffsetCheck, ByteDataByteOffsetCheck, 0xbb05a064) \ + TypedData_UnmodifiableFloat64x2ArrayView_factory, 0x6d8c5a1b) \ + V(Int8List, ., TypedData_Int8Array_factory, 0x65f0bd07) \ + V(Uint8List, ., TypedData_Uint8Array_factory, 0xedc6dace) \ + V(Uint8ClampedList, ., TypedData_Uint8ClampedArray_factory, 0x27e91bd4) \ + V(Int16List, ., TypedData_Int16Array_factory, 0xd0b07d72) \ + V(Uint16List, ., TypedData_Uint16Array_factory, 0x3c98dfe9) \ + V(Int32List, ., TypedData_Int32Array_factory, 0x1b72d79f) \ + V(Uint32List, ., TypedData_Uint32Array_factory, 0x2b127f0a) \ + V(Int64List, ., TypedData_Int64Array_factory, 0xfb54c2ae) \ + V(Uint64List, ., TypedData_Uint64Array_factory, 0xe3b2b477) \ + V(Float32List, ., TypedData_Float32Array_factory, 0xa3734d7d) \ + V(Float64List, ., TypedData_Float64Array_factory, 0xa0a93310) \ + V(Float32x4List, ., TypedData_Float32x4Array_factory, 0x0a606007) \ + V(Int32x4List, ., TypedData_Int32x4Array_factory, 0x59fa98ed) \ + V(Float64x2List, ., TypedData_Float64x2Array_factory, 0xecade3e9) \ + V(_TypedListBase, _memMove1, TypedData_memMove1, 0xd267f3d0) \ + V(_TypedListBase, _memMove2, TypedData_memMove2, 0xed299fd6) \ + V(_TypedListBase, _memMove4, TypedData_memMove4, 0xcfd4eb46) \ + V(_TypedListBase, _memMove8, TypedData_memMove8, 0xd1ca5745) \ + V(_TypedListBase, _memMove16, TypedData_memMove16, 0x077790f5) \ + V(::, _typedDataIndexCheck, TypedDataIndexCheck, 0x7912cea9) \ + V(::, _byteDataByteOffsetCheck, ByteDataByteOffsetCheck, 0xbaf71484) \ V(::, copyRangeFromUint8ListToOneByteString, \ - CopyRangeFromUint8ListToOneByteString, 0xcc42d0a2) \ - V(_StringBase, _interpolate, StringBaseInterpolate, 0x8af456e6) \ - V(_StringBase, codeUnitAt, StringBaseCodeUnitAt, 0x17ea80f1) \ + CopyRangeFromUint8ListToOneByteString, 0xcc3444c2) \ + V(_StringBase, _interpolate, StringBaseInterpolate, 0x3f22ce9e) \ + V(_StringBase, codeUnitAt, StringBaseCodeUnitAt, 0x17dbf511) \ V(_SuspendState, get:_functionData, SuspendState_getFunctionData, \ - 0x7281768e) \ + 0x7272eaae) \ V(_SuspendState, set:_functionData, SuspendState_setFunctionData, \ - 0x2b57dccb) \ + 0x2b4950eb) \ V(_SuspendState, get:_thenCallback, SuspendState_getThenCallback, \ - 0x2b907141) \ + 0x2b81e561) \ V(_SuspendState, set:_thenCallback, SuspendState_setThenCallback, \ - 0x752e28fe) \ + 0x751f9d1e) \ V(_SuspendState, get:_errorCallback, SuspendState_getErrorCallback, \ - 0xaebb7b0f) \ + 0xaeacef2f) \ V(_SuspendState, set:_errorCallback, SuspendState_setErrorCallback, \ - 0xc3fa77cc) \ - V(_SuspendState, _clone, SuspendState_clone, 0xae0bb4c0) \ - V(_SuspendState, _resume, SuspendState_resume, 0x5d6bf8a9) \ - V(_IntegerImplementation, toDouble, IntegerToDouble, 0x9763ff66) \ - V(_Double, _add, DoubleAdd, 0xea57d747) \ - V(_Double, _sub, DoubleSub, 0x2838c04e) \ - V(_Double, _mul, DoubleMul, 0x1f8a3b8c) \ - V(_Double, _div, DoubleDiv, 0x286eabb1) \ - V(_Double, _modulo, DoubleMod, 0xfda50c0f) \ - V(_Double, ceil, DoubleCeilToInt, 0xceea4be5) \ - V(_Double, ceilToDouble, DoubleCeilToDouble, 0x5f0d42f9) \ - V(_Double, floor, DoubleFloorToInt, 0x2a23b3a8) \ - V(_Double, floorToDouble, DoubleFloorToDouble, 0x54a63f68) \ - V(_Double, roundToDouble, DoubleRoundToDouble, 0x563b3e20) \ - V(_Double, toInt, DoubleToInteger, 0x676094c9) \ - V(_Double, truncateToDouble, DoubleTruncateToDouble, 0x62c5fa79) \ - V(::, min, MathMin, 0x82d8d2f3) \ - V(::, max, MathMax, 0x4b21168c) \ - V(::, _doublePow, MathDoublePow, 0xaeba6874) \ - V(::, _intPow, MathIntPow, 0xab4873fa) \ - V(::, _sin, MathSin, 0x17cc3e23) \ - V(::, _cos, MathCos, 0xf485f165) \ - V(::, _tan, MathTan, 0xeb0bc957) \ - V(::, _asin, MathAsin, 0x29d649be) \ - V(::, _acos, MathAcos, 0x1ffc14fb) \ - V(::, _atan, MathAtan, 0x10ebd512) \ - V(::, _atan2, MathAtan2, 0x58c66573) \ - V(::, _sqrt, MathSqrt, 0x0309a7b0) \ - V(::, _exp, MathExp, 0x00e673f0) \ - V(::, _log, MathLog, 0x099ff882) \ - V(FinalizerBase, get:_allEntries, FinalizerBase_getAllEntries, 0xf031668b) \ - V(FinalizerBase, set:_allEntries, FinalizerBase_setAllEntries, 0x8efa9508) \ - V(FinalizerBase, get:_detachments, FinalizerBase_getDetachments, 0x2f568356) \ - V(FinalizerBase, set:_detachments, FinalizerBase_setDetachments, 0x78809213) \ + 0xc3ebebec) \ + V(_SuspendState, _clone, SuspendState_clone, 0xadfd28e0) \ + V(_SuspendState, _resume, SuspendState_resume, 0x5d5d6cc9) \ + V(_IntegerImplementation, toDouble, IntegerToDouble, 0x97557386) \ + V(_Double, _add, DoubleAdd, 0xea494b67) \ + V(_Double, _sub, DoubleSub, 0x282a346e) \ + V(_Double, _mul, DoubleMul, 0x1f7bafac) \ + V(_Double, _div, DoubleDiv, 0x28601fd1) \ + V(_Double, _modulo, DoubleMod, 0xfd96802f) \ + V(_Double, ceil, DoubleCeilToInt, 0xcedbc005) \ + V(_Double, ceilToDouble, DoubleCeilToDouble, 0x5efeb719) \ + V(_Double, floor, DoubleFloorToInt, 0x2a1527c8) \ + V(_Double, floorToDouble, DoubleFloorToDouble, 0x5497b388) \ + V(_Double, roundToDouble, DoubleRoundToDouble, 0x562cb240) \ + V(_Double, toInt, DoubleToInteger, 0x675208e9) \ + V(_Double, truncateToDouble, DoubleTruncateToDouble, 0x62b76e99) \ + V(::, min, MathMin, 0x21232beb) \ + V(::, max, MathMax, 0xcf067384) \ + V(::, _doublePow, MathDoublePow, 0xaeabdc94) \ + V(::, _intPow, MathIntPow, 0xab39e81a) \ + V(::, _sin, MathSin, 0x17bdb243) \ + V(::, _cos, MathCos, 0xf4776585) \ + V(::, _tan, MathTan, 0xeafd3d77) \ + V(::, _asin, MathAsin, 0x29c7bdde) \ + V(::, _acos, MathAcos, 0x1fed891b) \ + V(::, _atan, MathAtan, 0x10dd4932) \ + V(::, _atan2, MathAtan2, 0x58b7d993) \ + V(::, _sqrt, MathSqrt, 0x02fb1bd0) \ + V(::, _exp, MathExp, 0x00d7e810) \ + V(::, _log, MathLog, 0x09916ca2) \ + V(FinalizerBase, get:_allEntries, FinalizerBase_getAllEntries, 0xf022daab) \ + V(FinalizerBase, set:_allEntries, FinalizerBase_setAllEntries, 0x8eec0928) \ + V(FinalizerBase, get:_detachments, FinalizerBase_getDetachments, 0x2f47f776) \ + V(FinalizerBase, set:_detachments, FinalizerBase_setDetachments, 0x78720633) \ V(FinalizerBase, _exchangeEntriesCollectedWithNull, \ - FinalizerBase_exchangeEntriesCollectedWithNull, 0x6c82991b) \ - V(FinalizerBase, _setIsolate, FinalizerBase_setIsolate, 0xbce95372) \ + FinalizerBase_exchangeEntriesCollectedWithNull, 0x6c740d3b) \ + V(FinalizerBase, _setIsolate, FinalizerBase_setIsolate, 0xbcdac792) \ V(FinalizerBase, get:_isolateFinalizers, FinalizerBase_getIsolateFinalizers, \ - 0x70e6b30c) \ + 0x70d8272c) \ V(FinalizerBase, set:_isolateFinalizers, FinalizerBase_setIsolateFinalizers, \ - 0xb3d7e109) \ - V(_FinalizerImpl, get:_callback, Finalizer_getCallback, 0x18503118) \ - V(_FinalizerImpl, set:_callback, Finalizer_setCallback, 0xacfcd255) \ - V(_NativeFinalizer, get:_callback, NativeFinalizer_getCallback, 0x5ca4e915) \ - V(_NativeFinalizer, set:_callback, NativeFinalizer_setCallback, 0xb113dd12) \ - V(FinalizerEntry, allocate, FinalizerEntry_allocate, 0xe0ac4c98) \ - V(FinalizerEntry, get:value, FinalizerEntry_getValue, 0xf5bb2df7) \ - V(FinalizerEntry, get:detach, FinalizerEntry_getDetach, 0x170e4d88) \ - V(FinalizerEntry, get:token, FinalizerEntry_getToken, 0x0482ce92) \ - V(FinalizerEntry, set:token, FinalizerEntry_setToken, 0x63bae10f) \ - V(FinalizerEntry, get:next, FinalizerEntry_getNext, 0x70f44bc4) \ + 0xb3c95529) \ + V(_FinalizerImpl, get:_callback, Finalizer_getCallback, 0x1841a538) \ + V(_FinalizerImpl, set:_callback, Finalizer_setCallback, 0xacee4675) \ + V(_NativeFinalizer, get:_callback, NativeFinalizer_getCallback, 0x5c965d35) \ + V(_NativeFinalizer, set:_callback, NativeFinalizer_setCallback, 0xb1055132) \ + V(FinalizerEntry, allocate, FinalizerEntry_allocate, 0xe09dc0b8) \ + V(FinalizerEntry, get:value, FinalizerEntry_getValue, 0xf5aca217) \ + V(FinalizerEntry, get:detach, FinalizerEntry_getDetach, 0x16ffc1a8) \ + V(FinalizerEntry, get:token, FinalizerEntry_getToken, 0x047442b2) \ + V(FinalizerEntry, set:token, FinalizerEntry_setToken, 0x63ac552f) \ + V(FinalizerEntry, get:next, FinalizerEntry_getNext, 0x70e5bfe4) \ V(FinalizerEntry, get:externalSize, FinalizerEntry_getExternalSize, \ - 0x47d0c503) \ - V(Float32x4, _Float32x4FromDoubles, Float32x4FromDoubles, 0x1836ed4b) \ - V(Float32x4, Float32x4.zero, Float32x4Zero, 0xd3a7b422) \ - V(Float32x4, _Float32x4Splat, Float32x4Splat, 0x1396c6e3) \ - V(Float32x4, Float32x4.fromInt32x4Bits, Int32x4ToFloat32x4, 0x7ec70962) \ - V(Float32x4, Float32x4.fromFloat64x2, Float64x2ToFloat32x4, 0x50b001ad) \ - V(_Float32x4, shuffle, Float32x4Shuffle, 0xa7e32c0b) \ - V(_Float32x4, shuffleMix, Float32x4ShuffleMix, 0x799236ec) \ - V(_Float32x4, get:signMask, Float32x4GetSignMask, 0x7c5c860a) \ - V(_Float32x4, equal, Float32x4Equal, 0x444c6196) \ - V(_Float32x4, greaterThan, Float32x4GreaterThan, 0x523ef19f) \ - V(_Float32x4, greaterThanOrEqual, Float32x4GreaterThanOrEqual, 0x4e5fd5d7) \ - V(_Float32x4, lessThan, Float32x4LessThan, 0x4a09e53d) \ - V(_Float32x4, lessThanOrEqual, Float32x4LessThanOrEqual, 0x4668c760) \ - V(_Float32x4, notEqual, Float32x4NotEqual, 0x6440a963) \ - V(_Float32x4, min, Float32x4Min, 0xe41012b2) \ - V(_Float32x4, max, Float32x4Max, 0xc63f9483) \ - V(_Float32x4, scale, Float32x4Scale, 0xa3a8bc22) \ - V(_Float32x4, sqrt, Float32x4Sqrt, 0xe4e86ed2) \ - V(_Float32x4, reciprocalSqrt, Float32x4ReciprocalSqrt, 0xddc96658) \ - V(_Float32x4, reciprocal, Float32x4Reciprocal, 0xd4439692) \ - V(_Float32x4, unary-, Float32x4Negate, 0xe69d3832) \ - V(_Float32x4, abs, Float32x4Abs, 0xeb37f268) \ - V(_Float32x4, clamp, Float32x4Clamp, 0x77bee5fd) \ - V(_Float32x4, _withX, Float32x4WithX, 0xa30913cf) \ - V(_Float32x4, _withY, Float32x4WithY, 0x9bab2863) \ - V(_Float32x4, _withZ, Float32x4WithZ, 0x97c7a2c0) \ - V(_Float32x4, _withW, Float32x4WithW, 0x9524967b) \ - V(Float64x2, _Float64x2FromDoubles, Float64x2FromDoubles, 0xd84a5471) \ - V(Float64x2, Float64x2.zero, Float64x2Zero, 0x8285fd38) \ - V(Float64x2, _Float64x2Splat, Float64x2Splat, 0x5b04dfe4) \ - V(Float64x2, Float64x2.fromFloat32x4, Float32x4ToFloat64x2, 0x6e991086) \ - V(_Float64x2, get:x, Float64x2GetX, 0x3a2af950) \ - V(_Float64x2, get:y, Float64x2GetY, 0x27bc5473) \ - V(_Float64x2, unary-, Float64x2Negate, 0x957b8148) \ - V(_Float64x2, abs, Float64x2Abs, 0x9a163b7e) \ - V(_Float64x2, clamp, Float64x2Clamp, 0xfdcd8953) \ - V(_Float64x2, sqrt, Float64x2Sqrt, 0x93c6b7e8) \ - V(_Float64x2, get:signMask, Float64x2GetSignMask, 0x7c5c860a) \ - V(_Float64x2, scale, Float64x2Scale, 0x52870538) \ - V(_Float64x2, _withX, Float64x2WithX, 0x51e75ce5) \ - V(_Float64x2, _withY, Float64x2WithY, 0x4a897179) \ - V(_Float64x2, min, Float64x2Min, 0x36205072) \ - V(_Float64x2, max, Float64x2Max, 0x184fd243) \ - V(Int32x4, _Int32x4FromInts, Int32x4FromInts, 0xa8f23150) \ - V(Int32x4, _Int32x4FromBools, Int32x4FromBools, 0xf55e03e8) \ - V(Int32x4, Int32x4.fromFloat32x4Bits, Float32x4ToInt32x4, 0x4563e981) \ - V(_Int32x4, get:flagX, Int32x4GetFlagX, 0xc29077f8) \ - V(_Int32x4, get:flagY, Int32x4GetFlagY, 0xde00aed8) \ - V(_Int32x4, get:flagZ, Int32x4GetFlagZ, 0xebaa4a2b) \ - V(_Int32x4, get:flagW, Int32x4GetFlagW, 0xf4ca5c6c) \ - V(_Int32x4, get:signMask, Int32x4GetSignMask, 0x7c5c860a) \ - V(_Int32x4, shuffle, Int32x4Shuffle, 0x405385f3) \ - V(_Int32x4, shuffleMix, Int32x4ShuffleMix, 0x4fd9a8bc) \ - V(_Int32x4, select, Int32x4Select, 0x68bc13c0) \ - V(_Int32x4, _withFlagX, Int32x4WithFlagX, 0xb7d07483) \ - V(_Int32x4, _withFlagY, Int32x4WithFlagY, 0xa8c10fc6) \ - V(_Int32x4, _withFlagZ, Int32x4WithFlagZ, 0xa7f6fc74) \ - V(_Int32x4, _withFlagW, Int32x4WithFlagW, 0xb3256d78) \ - V(_RawReceivePort, get:sendPort, ReceivePort_getSendPort, 0xe6ace48d) \ - V(_RawReceivePort, get:_handler, ReceivePort_getHandler, 0xf1e4d653) \ - V(_RawReceivePort, set:_handler, ReceivePort_setHandler, 0x570dc750) \ - V(_HashVMBase, get:_index, LinkedHashBase_getIndex, 0x8817e5fc) \ - V(_HashVMBase, set:_index, LinkedHashBase_setIndex, 0xa2b00838) \ - V(_HashVMBase, get:_data, LinkedHashBase_getData, 0x2c7cd2a3) \ - V(_HashVMBase, set:_data, LinkedHashBase_setData, 0x40e963df) \ - V(_HashVMBase, get:_usedData, LinkedHashBase_getUsedData, 0x46fa080d) \ - V(_HashVMBase, set:_usedData, LinkedHashBase_setUsedData, 0xb3b9fbc9) \ - V(_HashVMBase, get:_hashMask, LinkedHashBase_getHashMask, 0x4f003bbc) \ - V(_HashVMBase, set:_hashMask, LinkedHashBase_setHashMask, 0xbbc02f78) \ - V(_HashVMBase, get:_deletedKeys, LinkedHashBase_getDeletedKeys, 0x50ff38c0) \ - V(_HashVMBase, set:_deletedKeys, LinkedHashBase_setDeletedKeys, 0xbdbf2c7c) \ + 0x47c23923) \ + V(Float32x4, _Float32x4FromDoubles, Float32x4FromDoubles, 0x1828616b) \ + V(Float32x4, Float32x4.zero, Float32x4Zero, 0xd3992842) \ + V(Float32x4, _Float32x4Splat, Float32x4Splat, 0x13883b03) \ + V(Float32x4, Float32x4.fromInt32x4Bits, Int32x4ToFloat32x4, 0x7eb87d82) \ + V(Float32x4, Float32x4.fromFloat64x2, Float64x2ToFloat32x4, 0x50a175cd) \ + V(_Float32x4, shuffle, Float32x4Shuffle, 0xa7d4a02b) \ + V(_Float32x4, shuffleMix, Float32x4ShuffleMix, 0x7983ab0c) \ + V(_Float32x4, get:signMask, Float32x4GetSignMask, 0x7c4dfa2a) \ + V(_Float32x4, equal, Float32x4Equal, 0x443dd5b6) \ + V(_Float32x4, greaterThan, Float32x4GreaterThan, 0x523065bf) \ + V(_Float32x4, greaterThanOrEqual, Float32x4GreaterThanOrEqual, 0x4e5149f7) \ + V(_Float32x4, lessThan, Float32x4LessThan, 0x49fb595d) \ + V(_Float32x4, lessThanOrEqual, Float32x4LessThanOrEqual, 0x465a3b80) \ + V(_Float32x4, notEqual, Float32x4NotEqual, 0x64321d83) \ + V(_Float32x4, min, Float32x4Min, 0xe40186d2) \ + V(_Float32x4, max, Float32x4Max, 0xc63108a3) \ + V(_Float32x4, scale, Float32x4Scale, 0xa39a3042) \ + V(_Float32x4, sqrt, Float32x4Sqrt, 0xe4d9e2f2) \ + V(_Float32x4, reciprocalSqrt, Float32x4ReciprocalSqrt, 0xddbada78) \ + V(_Float32x4, reciprocal, Float32x4Reciprocal, 0xd4350ab2) \ + V(_Float32x4, unary-, Float32x4Negate, 0xe68eac52) \ + V(_Float32x4, abs, Float32x4Abs, 0xeb296688) \ + V(_Float32x4, clamp, Float32x4Clamp, 0x77b05a1d) \ + V(_Float32x4, _withX, Float32x4WithX, 0xa2fa87ef) \ + V(_Float32x4, _withY, Float32x4WithY, 0x9b9c9c83) \ + V(_Float32x4, _withZ, Float32x4WithZ, 0x97b916e0) \ + V(_Float32x4, _withW, Float32x4WithW, 0x95160a9b) \ + V(Float64x2, _Float64x2FromDoubles, Float64x2FromDoubles, 0xd83bc891) \ + V(Float64x2, Float64x2.zero, Float64x2Zero, 0x82777158) \ + V(Float64x2, _Float64x2Splat, Float64x2Splat, 0x5af65404) \ + V(Float64x2, Float64x2.fromFloat32x4, Float32x4ToFloat64x2, 0x6e8a84a6) \ + V(_Float64x2, get:x, Float64x2GetX, 0x3a1c6d70) \ + V(_Float64x2, get:y, Float64x2GetY, 0x27adc893) \ + V(_Float64x2, unary-, Float64x2Negate, 0x956cf568) \ + V(_Float64x2, abs, Float64x2Abs, 0x9a07af9e) \ + V(_Float64x2, clamp, Float64x2Clamp, 0xfdbefd73) \ + V(_Float64x2, sqrt, Float64x2Sqrt, 0x93b82c08) \ + V(_Float64x2, get:signMask, Float64x2GetSignMask, 0x7c4dfa2a) \ + V(_Float64x2, scale, Float64x2Scale, 0x52787958) \ + V(_Float64x2, _withX, Float64x2WithX, 0x51d8d105) \ + V(_Float64x2, _withY, Float64x2WithY, 0x4a7ae599) \ + V(_Float64x2, min, Float64x2Min, 0x3611c492) \ + V(_Float64x2, max, Float64x2Max, 0x18414663) \ + V(Int32x4, _Int32x4FromInts, Int32x4FromInts, 0xa8e3a570) \ + V(Int32x4, _Int32x4FromBools, Int32x4FromBools, 0xf54f7808) \ + V(Int32x4, Int32x4.fromFloat32x4Bits, Float32x4ToInt32x4, 0x45555da1) \ + V(_Int32x4, get:flagX, Int32x4GetFlagX, 0xc281ec18) \ + V(_Int32x4, get:flagY, Int32x4GetFlagY, 0xddf222f8) \ + V(_Int32x4, get:flagZ, Int32x4GetFlagZ, 0xeb9bbe4b) \ + V(_Int32x4, get:flagW, Int32x4GetFlagW, 0xf4bbd08c) \ + V(_Int32x4, get:signMask, Int32x4GetSignMask, 0x7c4dfa2a) \ + V(_Int32x4, shuffle, Int32x4Shuffle, 0x4044fa13) \ + V(_Int32x4, shuffleMix, Int32x4ShuffleMix, 0x4fcb1cdc) \ + V(_Int32x4, select, Int32x4Select, 0x68ad87e0) \ + V(_Int32x4, _withFlagX, Int32x4WithFlagX, 0xb7c1e8a3) \ + V(_Int32x4, _withFlagY, Int32x4WithFlagY, 0xa8b283e6) \ + V(_Int32x4, _withFlagZ, Int32x4WithFlagZ, 0xa7e87094) \ + V(_Int32x4, _withFlagW, Int32x4WithFlagW, 0xb316e198) \ + V(_RawReceivePort, get:sendPort, ReceivePort_getSendPort, 0xe69e58ad) \ + V(_RawReceivePort, get:_handler, ReceivePort_getHandler, 0xf1d64a73) \ + V(_RawReceivePort, set:_handler, ReceivePort_setHandler, 0x56ff3b70) \ + V(_HashVMBase, get:_index, LinkedHashBase_getIndex, 0x88095a1c) \ + V(_HashVMBase, set:_index, LinkedHashBase_setIndex, 0xa2a17c58) \ + V(_HashVMBase, get:_data, LinkedHashBase_getData, 0x2c6e46c3) \ + V(_HashVMBase, set:_data, LinkedHashBase_setData, 0x40dad7ff) \ + V(_HashVMBase, get:_usedData, LinkedHashBase_getUsedData, 0x46eb7c2d) \ + V(_HashVMBase, set:_usedData, LinkedHashBase_setUsedData, 0xb3ab6fe9) \ + V(_HashVMBase, get:_hashMask, LinkedHashBase_getHashMask, 0x4ef1afdc) \ + V(_HashVMBase, set:_hashMask, LinkedHashBase_setHashMask, 0xbbb1a398) \ + V(_HashVMBase, get:_deletedKeys, LinkedHashBase_getDeletedKeys, 0x50f0ace0) \ + V(_HashVMBase, set:_deletedKeys, LinkedHashBase_setDeletedKeys, 0xbdb0a09c) \ V(_HashVMImmutableBase, get:_data, ImmutableLinkedHashBase_getData, \ - 0x2c7cd2a3) \ + 0x2c6e46c3) \ V(_HashVMImmutableBase, get:_indexNullable, \ - ImmutableLinkedHashBase_getIndex, 0xfd78f01b) \ + ImmutableLinkedHashBase_getIndex, 0xfd6a643b) \ V(_HashVMImmutableBase, set:_index, \ - ImmutableLinkedHashBase_setIndexStoreRelease, 0xa2b00838) \ - V(_WeakProperty, get:key, WeakProperty_getKey, 0xddf25882) \ - V(_WeakProperty, set:key, WeakProperty_setKey, 0x962b7d7f) \ - V(_WeakProperty, get:value, WeakProperty_getValue, 0xd2e3fece) \ - V(_WeakProperty, set:value, WeakProperty_setValue, 0x8b1d23cb) \ - V(_WeakReference, get:target, WeakReference_getTarget, 0xc98185aa) \ - V(_WeakReference, set:_target, WeakReference_setTarget, 0xc71add9a) \ - V(::, _abi, FfiAbi, 0x7c3c2b95) \ - V(::, _ffiCall, FfiCall, 0x6118e962) \ - V(::, _nativeCallbackFunction, FfiNativeCallbackFunction, 0x3fe722bc) \ + ImmutableLinkedHashBase_setIndexStoreRelease, 0xa2a17c58) \ + V(_WeakProperty, get:key, WeakProperty_getKey, 0xdde3cca2) \ + V(_WeakProperty, set:key, WeakProperty_setKey, 0x961cf19f) \ + V(_WeakProperty, get:value, WeakProperty_getValue, 0xd2d572ee) \ + V(_WeakProperty, set:value, WeakProperty_setValue, 0x8b0e97eb) \ + V(_WeakReference, get:target, WeakReference_getTarget, 0xc972f9ca) \ + V(_WeakReference, set:_target, WeakReference_setTarget, 0xc70c51ba) \ + V(::, _abi, FfiAbi, 0x7c2d9fb5) \ + V(::, _ffiCall, FfiCall, 0x610a5d82) \ + V(::, _nativeCallbackFunction, FfiNativeCallbackFunction, 0x3fd896dc) \ V(::, _nativeAsyncCallbackFunction, FfiNativeAsyncCallbackFunction, \ - 0xbec4b7b9) \ + 0xbeb62bd9) \ V(::, _nativeIsolateLocalCallbackFunction, \ - FfiNativeIsolateLocalCallbackFunction, 0x03e1a51f) \ - V(::, _nativeEffect, NativeEffect, 0x536f42b1) \ - V(::, _loadAbiSpecificInt, FfiLoadAbiSpecificInt, 0x77f96053) \ - V(::, _loadAbiSpecificIntAtIndex, FfiLoadAbiSpecificIntAtIndex, 0xaab9c762) \ - V(::, _loadInt8, FfiLoadInt8, 0x0ef657b7) \ - V(::, _loadInt16, FfiLoadInt16, 0xec35a90e) \ - V(::, _loadInt32, FfiLoadInt32, 0xee13b7a4) \ - V(::, _loadInt64, FfiLoadInt64, 0xdee13784) \ - V(::, _loadUint8, FfiLoadUint8, 0xe13f94b2) \ - V(::, _loadUint16, FfiLoadUint16, 0x0cc7d4cb) \ - V(::, _loadUint32, FfiLoadUint32, 0xf6600836) \ - V(::, _loadUint64, FfiLoadUint64, 0x04f775ad) \ - V(::, _loadFloat, FfiLoadFloat, 0xf8caf87d) \ - V(::, _loadFloatUnaligned, FfiLoadFloatUnaligned, 0xc8ba541f) \ - V(::, _loadDouble, FfiLoadDouble, 0xf6fe3a39) \ - V(::, _loadDoubleUnaligned, FfiLoadDoubleUnaligned, 0xc9903159) \ - V(::, _loadPointer, FfiLoadPointer, 0x99f984e4) \ - V(::, _storeAbiSpecificInt, FfiStoreAbiSpecificInt, 0xc6facca1) \ - V(::, _storeAbiSpecificIntAtIndex, FfiStoreAbiSpecificIntAtIndex, 0x5b85a53f)\ - V(::, _storeInt8, FfiStoreInt8, 0xdf4226ed) \ - V(::, _storeInt16, FfiStoreInt16, 0xd83f6b13) \ - V(::, _storeInt32, FfiStoreInt32, 0xfbd7a43e) \ - V(::, _storeInt64, FfiStoreInt64, 0xf1c5855b) \ - V(::, _storeUint8, FfiStoreUint8, 0x055f4ad7) \ - V(::, _storeUint16, FfiStoreUint16, 0xe2ef22bf) \ - V(::, _storeUint32, FfiStoreUint32, 0xe5c960a6) \ - V(::, _storeUint64, FfiStoreUint64, 0xe2caaa1a) \ - V(::, _storeFloat, FfiStoreFloat, 0x6476649e) \ - V(::, _storeFloatUnaligned, FfiStoreFloatUnaligned, 0x5ffc0623) \ - V(::, _storeDouble, FfiStoreDouble, 0x428b0084) \ - V(::, _storeDoubleUnaligned, FfiStoreDoubleUnaligned, 0x3dc04b7b) \ - V(::, _storePointer, FfiStorePointer, 0x8b5a5939) \ - V(::, _fromAddress, FfiFromAddress, 0x810f9a01) \ - V(Pointer, get:address, FfiGetAddress, 0x7ccffbde) \ - V(Native, _addressOf, FfiNativeAddressOf, 0x83a4f97d) \ - V(::, _asExternalTypedDataInt8, FfiAsExternalTypedDataInt8, 0x767b7e79) \ - V(::, _asExternalTypedDataInt16, FfiAsExternalTypedDataInt16, 0xd08e71a7) \ - V(::, _asExternalTypedDataInt32, FfiAsExternalTypedDataInt32, 0x38160127) \ - V(::, _asExternalTypedDataInt64, FfiAsExternalTypedDataInt64, 0xaf9bbfdc) \ - V(::, _asExternalTypedDataUint8, FfiAsExternalTypedDataUint8, 0x35140015) \ - V(::, _asExternalTypedDataUint16, FfiAsExternalTypedDataUint16, 0x8996961b) \ - V(::, _asExternalTypedDataUint32, FfiAsExternalTypedDataUint32, 0xd2645422) \ - V(::, _asExternalTypedDataUint64, FfiAsExternalTypedDataUint64, 0x06afe9a6) \ - V(::, _asExternalTypedDataFloat, FfiAsExternalTypedDataFloat, 0x6f37d5ed) \ - V(::, _asExternalTypedDataDouble, FfiAsExternalTypedDataDouble, 0x40bf51c2) \ - V(::, _getNativeField, GetNativeField, 0xa0051366) \ - V(::, reachabilityFence, ReachabilityFence, 0x73009f9f) \ - V(_Utf8Decoder, _scan, Utf8DecoderScan, 0xb98ea6c2) \ - V(_FutureListener, handleValue, FutureListenerHandleValue, 0xec1745d2) \ - V(::, get:has63BitSmis, Has63BitSmis, 0xf60ccb11) \ - V(::, get:extensionStreamHasListener, ExtensionStreamHasListener, 0xfaa5dee5)\ - V(_Smi, get:hashCode, Smi_hashCode, 0x75d240f2) \ - V(_Mint, get:hashCode, Mint_hashCode, 0x75d240f2) \ - V(_Double, get:hashCode, Double_hashCode, 0x75d244b3) \ - V(::, _memCopy, MemCopy, 0x2740bc36) \ - V(::, debugger, Debugger, 0xf0b98af4) \ - V(::, _checkNotDeeplyImmutable, CheckNotDeeplyImmutable, 0x5646c2e4) \ + FfiNativeIsolateLocalCallbackFunction, 0x03d3193f) \ + V(::, _nativeEffect, NativeEffect, 0x5360b6d1) \ + V(::, _loadAbiSpecificInt, FfiLoadAbiSpecificInt, 0x77ead473) \ + V(::, _loadAbiSpecificIntAtIndex, FfiLoadAbiSpecificIntAtIndex, 0xaaab3b82) \ + V(::, _loadInt8, FfiLoadInt8, 0x0ee7cbd7) \ + V(::, _loadInt16, FfiLoadInt16, 0xec271d2e) \ + V(::, _loadInt32, FfiLoadInt32, 0xee052bc4) \ + V(::, _loadInt64, FfiLoadInt64, 0xded2aba4) \ + V(::, _loadUint8, FfiLoadUint8, 0xe13108d2) \ + V(::, _loadUint16, FfiLoadUint16, 0x0cb948eb) \ + V(::, _loadUint32, FfiLoadUint32, 0xf6517c56) \ + V(::, _loadUint64, FfiLoadUint64, 0x04e8e9cd) \ + V(::, _loadFloat, FfiLoadFloat, 0xf8bc6c9d) \ + V(::, _loadFloatUnaligned, FfiLoadFloatUnaligned, 0xc8abc83f) \ + V(::, _loadDouble, FfiLoadDouble, 0xf6efae59) \ + V(::, _loadDoubleUnaligned, FfiLoadDoubleUnaligned, 0xc981a579) \ + V(::, _loadPointer, FfiLoadPointer, 0x99eaf904) \ + V(::, _storeAbiSpecificInt, FfiStoreAbiSpecificInt, 0xc6ec40c1) \ + V(::, _storeAbiSpecificIntAtIndex, FfiStoreAbiSpecificIntAtIndex, 0x5b77195f)\ + V(::, _storeInt8, FfiStoreInt8, 0xdf339b0d) \ + V(::, _storeInt16, FfiStoreInt16, 0xd830df33) \ + V(::, _storeInt32, FfiStoreInt32, 0xfbc9185e) \ + V(::, _storeInt64, FfiStoreInt64, 0xf1b6f97b) \ + V(::, _storeUint8, FfiStoreUint8, 0x0550bef7) \ + V(::, _storeUint16, FfiStoreUint16, 0xe2e096df) \ + V(::, _storeUint32, FfiStoreUint32, 0xe5bad4c6) \ + V(::, _storeUint64, FfiStoreUint64, 0xe2bc1e3a) \ + V(::, _storeFloat, FfiStoreFloat, 0x6467d8be) \ + V(::, _storeFloatUnaligned, FfiStoreFloatUnaligned, 0x5fed7a43) \ + V(::, _storeDouble, FfiStoreDouble, 0x427c74a4) \ + V(::, _storeDoubleUnaligned, FfiStoreDoubleUnaligned, 0x3db1bf9b) \ + V(::, _storePointer, FfiStorePointer, 0x8b4bcd59) \ + V(::, _fromAddress, FfiFromAddress, 0x81010e21) \ + V(Pointer, get:address, FfiGetAddress, 0x7cc16ffe) \ + V(Native, _addressOf, FfiNativeAddressOf, 0x83966d9d) \ + V(::, _asExternalTypedDataInt8, FfiAsExternalTypedDataInt8, 0x766cf299) \ + V(::, _asExternalTypedDataInt16, FfiAsExternalTypedDataInt16, 0xd07fe5c7) \ + V(::, _asExternalTypedDataInt32, FfiAsExternalTypedDataInt32, 0x38077547) \ + V(::, _asExternalTypedDataInt64, FfiAsExternalTypedDataInt64, 0xaf8d33fc) \ + V(::, _asExternalTypedDataUint8, FfiAsExternalTypedDataUint8, 0x35057435) \ + V(::, _asExternalTypedDataUint16, FfiAsExternalTypedDataUint16, 0x89880a3b) \ + V(::, _asExternalTypedDataUint32, FfiAsExternalTypedDataUint32, 0xd255c842) \ + V(::, _asExternalTypedDataUint64, FfiAsExternalTypedDataUint64, 0x06a15dc6) \ + V(::, _asExternalTypedDataFloat, FfiAsExternalTypedDataFloat, 0x6f294a0d) \ + V(::, _asExternalTypedDataDouble, FfiAsExternalTypedDataDouble, 0x40b0c5e2) \ + V(::, _getNativeField, GetNativeField, 0x9ff68786) \ + V(::, reachabilityFence, ReachabilityFence, 0x72f213bf) \ + V(_Utf8Decoder, _scan, Utf8DecoderScan, 0xb9801ae2) \ + V(_FutureListener, handleValue, FutureListenerHandleValue, 0xec08b9f2) \ + V(::, get:has63BitSmis, Has63BitSmis, 0xf5fe3f31) \ + V(::, get:extensionStreamHasListener, ExtensionStreamHasListener, 0xfa975305)\ + V(_Smi, get:hashCode, Smi_hashCode, 0x75c3b512) \ + V(_Mint, get:hashCode, Mint_hashCode, 0x75c3b512) \ + V(_Double, get:hashCode, Double_hashCode, 0x75c3b8d3) \ + V(::, _memCopy, MemCopy, 0x27323056) \ + V(::, debugger, Debugger, 0xf0aaff14) \ + V(::, _checkNotDeeplyImmutable, CheckNotDeeplyImmutable, 0x56383704) \ // List of intrinsics: // (class-name, function-name, intrinsification method, fingerprint). #define CORE_LIB_INTRINSIC_LIST(V) \ - V(_Smi, get:bitLength, Smi_bitLength, 0x7aa6810b) \ - V(_BigIntImpl, _lsh, Bigint_lsh, 0x3fd48b02) \ - V(_BigIntImpl, _rsh, Bigint_rsh, 0xde054a3f) \ - V(_BigIntImpl, _absAdd, Bigint_absAdd, 0x2ab3ee51) \ - V(_BigIntImpl, _absSub, Bigint_absSub, 0x70ff3dcb) \ - V(_BigIntImpl, _mulAdd, Bigint_mulAdd, 0x3d47f01d) \ - V(_BigIntImpl, _sqrAdd, Bigint_sqrAdd, 0x8fa60a65) \ + V(_Smi, get:bitLength, Smi_bitLength, 0x7a97f52b) \ + V(_BigIntImpl, _lsh, Bigint_lsh, 0x3fc5ff22) \ + V(_BigIntImpl, _rsh, Bigint_rsh, 0xddf6be5f) \ + V(_BigIntImpl, _absAdd, Bigint_absAdd, 0x2aa56271) \ + V(_BigIntImpl, _absSub, Bigint_absSub, 0x70f0b1eb) \ + V(_BigIntImpl, _mulAdd, Bigint_mulAdd, 0x3d39643d) \ + V(_BigIntImpl, _sqrAdd, Bigint_sqrAdd, 0x8f977e85) \ V(_BigIntImpl, _estimateQuotientDigit, Bigint_estimateQuotientDigit, \ - 0x16c6fd68) \ - V(_BigIntMontgomeryReduction, _mulMod, Montgomery_mulMod, 0xdc900374) \ - V(_Double, >, Double_greaterThan, 0x7b024427) \ - V(_Double, >=, Double_greaterEqualThan, 0x4aae9393) \ - V(_Double, <, Double_lessThan, 0xd309ff94) \ - V(_Double, <=, Double_lessEqualThan, 0x02593175) \ - V(_Double, ==, Double_equal, 0x27744e0f) \ - V(_Double, +, Double_add, 0xa7d69d7f) \ - V(_Double, -, Double_sub, 0x9ac3a9d0) \ - V(_Double, *, Double_mul, 0xdc4ab3cd) \ - V(_Double, /, Double_div, 0xd2794209) \ - V(_Double, get:isNaN, Double_getIsNaN, 0xd47a7b33) \ - V(_Double, get:isInfinite, Double_getIsInfinite, 0xc4ec3ff2) \ - V(_Double, get:isNegative, Double_getIsNegative, 0xd462c4b1) \ - V(_Double, _mulFromInteger, Double_mulFromInteger, 0xece04a8f) \ - V(_Double, .fromInteger, DoubleFromInteger, 0x7d014db9) \ - V(_RegExp, _ExecuteMatch, RegExp_ExecuteMatch, 0x99034969) \ - V(_RegExp, _ExecuteMatchSticky, RegExp_ExecuteMatchSticky, 0x91cefc2f) \ - V(Object, ==, ObjectEquals, 0x4649e450) \ - V(Object, get:runtimeType, ObjectRuntimeType, 0x03733c71) \ - V(Object, _haveSameRuntimeType, ObjectHaveSameRuntimeType, 0xce3fd6b5) \ - V(_StringBase, get:hashCode, String_getHashCode, 0x75d24874) \ - V(_StringBase, get:_identityHashCode, String_identityHash, 0x4796dd32) \ - V(_StringBase, get:isEmpty, StringBaseIsEmpty, 0x98685173) \ - V(_StringBase, _substringMatches, StringBaseSubstringMatches, 0x852eb692) \ - V(_StringBase, [], StringBaseCharAt, 0xd0613adf) \ - V(_OneByteString, get:hashCode, OneByteString_getHashCode, 0x75d24874) \ + 0x16b87188) \ + V(_BigIntMontgomeryReduction, _mulMod, Montgomery_mulMod, 0xdc817794) \ + V(_Double, >, Double_greaterThan, 0x7af3b847) \ + V(_Double, >=, Double_greaterEqualThan, 0x4aa007b3) \ + V(_Double, <, Double_lessThan, 0xd2fb73b4) \ + V(_Double, <=, Double_lessEqualThan, 0x024aa595) \ + V(_Double, ==, Double_equal, 0x3694bad0) \ + V(_Double, +, Double_add, 0xa7c8119f) \ + V(_Double, -, Double_sub, 0x9ab51df0) \ + V(_Double, *, Double_mul, 0xdc3c27ed) \ + V(_Double, /, Double_div, 0xd26ab629) \ + V(_Double, get:isNaN, Double_getIsNaN, 0xd46bef53) \ + V(_Double, get:isInfinite, Double_getIsInfinite, 0xc4ddb412) \ + V(_Double, get:isNegative, Double_getIsNegative, 0xd45438d1) \ + V(_Double, _mulFromInteger, Double_mulFromInteger, 0xecd1beaf) \ + V(_Double, .fromInteger, DoubleFromInteger, 0x7cf2c1d9) \ + V(_RegExp, _ExecuteMatch, RegExp_ExecuteMatch, 0x98f4bd89) \ + V(_RegExp, _ExecuteMatchSticky, RegExp_ExecuteMatchSticky, 0x91c0704f) \ + V(Object, ==, ObjectEquals, 0x463b5870) \ + V(Object, get:runtimeType, ObjectRuntimeType, 0x0364b091) \ + V(Object, _haveSameRuntimeType, ObjectHaveSameRuntimeType, 0xce314ad5) \ + V(_StringBase, get:hashCode, String_getHashCode, 0x75c3bc94) \ + V(_StringBase, get:_identityHashCode, String_identityHash, 0x47885152) \ + V(_StringBase, get:isEmpty, StringBaseIsEmpty, 0x9859c593) \ + V(_StringBase, _substringMatches, StringBaseSubstringMatches, 0x85202ab2) \ + V(_StringBase, [], StringBaseCharAt, 0xd052aeff) \ + V(_OneByteString, get:hashCode, OneByteString_getHashCode, 0x75c3bc94) \ V(_OneByteString, _substringUncheckedNative, \ - OneByteString_substringUnchecked, 0x9b098d7e) \ - V(_OneByteString, ==, OneByteString_equality, 0x4e9b51e9) \ - V(_TwoByteString, ==, TwoByteString_equality, 0x4e9b51e9) \ - V(_AbstractType, get:hashCode, AbstractType_getHashCode, 0x75d24874) \ - V(_AbstractType, ==, AbstractType_equality, 0x4649dcce) \ - V(_Type, ==, Type_equality, 0x4649dcce) \ - V(::, _getHash, Object_getHash, 0xc6016b78) \ + OneByteString_substringUnchecked, 0x9afb019e) \ + V(_OneByteString, ==, OneByteString_equality, 0x4e8cc609) \ + V(_TwoByteString, ==, TwoByteString_equality, 0x4e8cc609) \ + V(_AbstractType, get:hashCode, AbstractType_getHashCode, 0x75c3bc94) \ + V(_AbstractType, ==, AbstractType_equality, 0x463b50ee) \ + V(_Type, ==, Type_equality, 0x463b50ee) \ + V(::, _getHash, Object_getHash, 0xc5f2df98) \ #define CORE_INTEGER_LIB_INTRINSIC_LIST(V) \ - V(_IntegerImplementation, >, Integer_greaterThan, 0xd9d0e0fb) \ - V(_IntegerImplementation, ==, Integer_equal, 0xe95d722a) \ + V(_IntegerImplementation, >, Integer_greaterThan, 0xd9c2551b) \ + V(_IntegerImplementation, ==, Integer_equal, 0xd4661e09) \ V(_IntegerImplementation, _equalToInteger, Integer_equalToInteger, \ - 0x71008ce2) \ - V(_IntegerImplementation, <, Integer_lessThan, 0xd309ff94) \ - V(_IntegerImplementation, <=, Integer_lessEqualThan, 0x02593175) \ - V(_IntegerImplementation, >=, Integer_greaterEqualThan, 0x4aae9393) \ - V(_IntegerImplementation, <<, Integer_shl, 0x2d253e1b) \ + 0x70f20102) \ + V(_IntegerImplementation, <, Integer_lessThan, 0xd2fb73b4) \ + V(_IntegerImplementation, <=, Integer_lessEqualThan, 0x024aa595) \ + V(_IntegerImplementation, >=, Integer_greaterEqualThan, 0x4aa007b3) \ + V(_IntegerImplementation, <<, Integer_shl, 0x2d16b23b) \ #define GRAPH_TYPED_DATA_INTRINSICS_LIST(V) \ - V(_Int8List, []=, Int8ArraySetIndexed, 0x02f7bc29) \ - V(_Uint8List, []=, Uint8ArraySetIndexed, 0xc8fdea5d) \ - V(_ExternalUint8Array, []=, ExternalUint8ArraySetIndexed, 0xc8fdea5d) \ - V(_Uint8ClampedList, []=, Uint8ClampedArraySetIndexed, 0x45020fa5) \ + V(_Int8List, []=, Int8ArraySetIndexed, 0x02e93049) \ + V(_Uint8List, []=, Uint8ArraySetIndexed, 0xc8ef5e7d) \ + V(_ExternalUint8Array, []=, ExternalUint8ArraySetIndexed, 0xc8ef5e7d) \ + V(_Uint8ClampedList, []=, Uint8ClampedArraySetIndexed, 0x44f383c5) \ V(_ExternalUint8ClampedArray, []=, ExternalUint8ClampedArraySetIndexed, \ - 0x45020fa5) \ - V(_Int16List, []=, Int16ArraySetIndexed, 0x3c52d77c) \ - V(_Uint16List, []=, Uint16ArraySetIndexed, 0x96e38a7c) \ - V(_Int32List, []=, Int32ArraySetIndexed, 0x7cf2875c) \ - V(_Uint32List, []=, Uint32ArraySetIndexed, 0xe5065f1c) \ - V(_Int64List, []=, Int64ArraySetIndexed, 0x672a7e1c) \ - V(_Uint64List, []=, Uint64ArraySetIndexed, 0x5e2325bc) \ - V(_Float64List, []=, Float64ArraySetIndexed, 0x84d73842) \ - V(_Float32List, []=, Float32ArraySetIndexed, 0x5e323082) \ - V(_Float32x4List, []=, Float32x4ArraySetIndexed, 0xadc022db) \ - V(_Int32x4List, []=, Int32x4ArraySetIndexed, 0xf38ac7d3) \ - V(_Float64x2List, []=, Float64x2ArraySetIndexed, 0xf316f725) \ - V(_TypedListBase, get:length, TypedListBaseLength, 0x5842648b) \ - V(_ByteDataView, get:length, ByteDataViewLength, 0x5842648b) \ - V(_Float32x4, get:x, Float32x4GetX, 0x3a2af950) \ - V(_Float32x4, get:y, Float32x4GetY, 0x27bc5473) \ - V(_Float32x4, get:z, Float32x4GetZ, 0x5d87c009) \ - V(_Float32x4, get:w, Float32x4GetW, 0x3fc8048b) \ - V(_Float32x4, *, Float32x4Mul, 0xe541f0a7) \ - V(_Float32x4, /, Float32x4Div, 0xc090a382) \ - V(_Float32x4, -, Float32x4Sub, 0xdd23e06a) \ - V(_Float32x4, +, Float32x4Add, 0xb7eb15f9) \ - V(_Float64x2, *, Float64x2Mul, 0x37522aa6) \ - V(_Float64x2, /, Float64x2Div, 0x12a0e142) \ - V(_Float64x2, -, Float64x2Sub, 0x2f341a69) \ - V(_Float64x2, +, Float64x2Add, 0x09fb4ff8) \ + 0x44f383c5) \ + V(_Int16List, []=, Int16ArraySetIndexed, 0x3c444b9c) \ + V(_Uint16List, []=, Uint16ArraySetIndexed, 0x96d4fe9c) \ + V(_Int32List, []=, Int32ArraySetIndexed, 0x7ce3fb7c) \ + V(_Uint32List, []=, Uint32ArraySetIndexed, 0xe4f7d33c) \ + V(_Int64List, []=, Int64ArraySetIndexed, 0x671bf23c) \ + V(_Uint64List, []=, Uint64ArraySetIndexed, 0x5e1499dc) \ + V(_Float64List, []=, Float64ArraySetIndexed, 0x84c8ac62) \ + V(_Float32List, []=, Float32ArraySetIndexed, 0x5e23a4a2) \ + V(_Float32x4List, []=, Float32x4ArraySetIndexed, 0xadb196fb) \ + V(_Int32x4List, []=, Int32x4ArraySetIndexed, 0xf37c3bf3) \ + V(_Float64x2List, []=, Float64x2ArraySetIndexed, 0xf3086b45) \ + V(_TypedListBase, get:length, TypedListBaseLength, 0x5833d8ab) \ + V(_ByteDataView, get:length, ByteDataViewLength, 0x5833d8ab) \ + V(_Float32x4, get:x, Float32x4GetX, 0x3a1c6d70) \ + V(_Float32x4, get:y, Float32x4GetY, 0x27adc893) \ + V(_Float32x4, get:z, Float32x4GetZ, 0x5d793429) \ + V(_Float32x4, get:w, Float32x4GetW, 0x3fb978ab) \ + V(_Float32x4, *, Float32x4Mul, 0xe53364c7) \ + V(_Float32x4, /, Float32x4Div, 0xc08217a2) \ + V(_Float32x4, -, Float32x4Sub, 0xdd15548a) \ + V(_Float32x4, +, Float32x4Add, 0xb7dc8a19) \ + V(_Float64x2, *, Float64x2Mul, 0x37439ec6) \ + V(_Float64x2, /, Float64x2Div, 0x12925562) \ + V(_Float64x2, -, Float64x2Sub, 0x2f258e89) \ + V(_Float64x2, +, Float64x2Add, 0x09ecc418) \ #define GRAPH_CORE_INTRINSICS_LIST(V) \ - V(_Array, get:length, ObjectArrayLength, 0x5842648b) \ - V(_List, _setIndexed, ObjectArraySetIndexedUnchecked, 0xe6212a10) \ - V(_GrowableList, get:length, GrowableArrayLength, 0x5842648b) \ - V(_GrowableList, get:_capacity, GrowableArrayCapacity, 0x7d911012) \ - V(_GrowableList, _setData, GrowableArraySetData, 0xbdcbb43b) \ - V(_GrowableList, _setLength, GrowableArraySetLength, 0xcc0d6dd6) \ - V(_GrowableList, _setIndexed, GrowableArraySetIndexedUnchecked, 0x513c774f) \ - V(_StringBase, get:length, StringBaseLength, 0x5842648b) \ - V(_Smi, ~, Smi_bitNegate, 0x82466cfc) \ - V(_IntegerImplementation, +, Integer_add, 0x6f06d26c) \ - V(_IntegerImplementation, -, Integer_sub, 0x630fe15d) \ - V(_IntegerImplementation, *, Integer_mul, 0x467f35fa) \ - V(_IntegerImplementation, %, Integer_mod, 0xdb44b214) \ - V(_IntegerImplementation, ~/, Integer_truncDivide, 0xe536d880) \ - V(_IntegerImplementation, unary-, Integer_negate, 0x914f7873) \ - V(_IntegerImplementation, &, Integer_bitAnd, 0x4253b969) \ - V(_IntegerImplementation, |, Integer_bitOr, 0x45fe3321) \ - V(_IntegerImplementation, ^, Integer_bitXor, 0x8eeefc28) \ - V(_IntegerImplementation, >>, Integer_sar, 0x49d5f8c0) \ - V(_IntegerImplementation, >>>, Integer_shr, 0x2b4c3522) \ - V(_Double, unary-, DoubleFlipSignBit, 0x3d2a7c4b) \ + V(_Array, get:length, ObjectArrayLength, 0x5833d8ab) \ + V(_List, _setIndexed, ObjectArraySetIndexedUnchecked, 0xe6129e30) \ + V(_GrowableList, get:length, GrowableArrayLength, 0x5833d8ab) \ + V(_GrowableList, get:_capacity, GrowableArrayCapacity, 0x7d828432) \ + V(_GrowableList, _setData, GrowableArraySetData, 0xbdbd285b) \ + V(_GrowableList, _setLength, GrowableArraySetLength, 0xcbfee1f6) \ + V(_GrowableList, _setIndexed, GrowableArraySetIndexedUnchecked, 0x512deb6f) \ + V(_StringBase, get:length, StringBaseLength, 0x5833d8ab) \ + V(_Smi, ~, Smi_bitNegate, 0x8237e11c) \ + V(_IntegerImplementation, +, Integer_add, 0x6ef8468c) \ + V(_IntegerImplementation, -, Integer_sub, 0x6301557d) \ + V(_IntegerImplementation, *, Integer_mul, 0x4670aa1a) \ + V(_IntegerImplementation, %, Integer_mod, 0x66f6edd5) \ + V(_IntegerImplementation, ~/, Integer_truncDivide, 0x70e91441) \ + V(_IntegerImplementation, unary-, Integer_negate, 0x9140ec93) \ + V(_IntegerImplementation, &, Integer_bitAnd, 0x42452d89) \ + V(_IntegerImplementation, |, Integer_bitOr, 0x45efa741) \ + V(_IntegerImplementation, ^, Integer_bitXor, 0x8ee07048) \ + V(_IntegerImplementation, >>, Integer_sar, 0x49c76ce0) \ + V(_IntegerImplementation, >>>, Integer_shr, 0x2b3da942) \ + V(_Double, unary-, DoubleFlipSignBit, 0x3d1bf06b) \ #define GRAPH_INTRINSICS_LIST(V) \ GRAPH_CORE_INTRINSICS_LIST(V) \ GRAPH_TYPED_DATA_INTRINSICS_LIST(V) \ #define DEVELOPER_LIB_INTRINSIC_LIST(V) \ - V(::, _getDefaultTag, UserTag_defaultTag, 0x6c0b3cc5) \ - V(::, _getCurrentTag, Profiler_getCurrentTag, 0x70dc44ae) \ - V(::, _isDartStreamEnabled, Timeline_isDartStreamEnabled, 0xc96c23d3) \ - V(::, _getNextTaskId, Timeline_getNextTaskId, 0x5b1c7f2b) \ + V(::, _getDefaultTag, UserTag_defaultTag, 0x6bfcb0e5) \ + V(::, _getCurrentTag, Profiler_getCurrentTag, 0x70cdb8ce) \ + V(::, _isDartStreamEnabled, Timeline_isDartStreamEnabled, 0xc95d97f3) \ + V(::, _getNextTaskId, Timeline_getNextTaskId, 0x5b0df34b) \ #define INTERNAL_LIB_INTRINSIC_LIST(V) \ - V(::, allocateOneByteString, AllocateOneByteString, 0x9e68b9f5) \ - V(::, allocateTwoByteString, AllocateTwoByteString, 0xa62df592) \ - V(::, writeIntoOneByteString, WriteIntoOneByteString, 0xd8640581) \ - V(::, writeIntoTwoByteString, WriteIntoTwoByteString, 0xcfb90c4a) \ + V(::, allocateOneByteString, AllocateOneByteString, 0x9e5a2e15) \ + V(::, allocateTwoByteString, AllocateTwoByteString, 0xa61f69b2) \ + V(::, writeIntoOneByteString, WriteIntoOneByteString, 0xd85579a1) \ + V(::, writeIntoTwoByteString, WriteIntoTwoByteString, 0xcfaa806a) \ #define ALL_INTRINSICS_NO_INTEGER_LIB_LIST(V) \ CORE_LIB_INTRINSIC_LIST(V) \ @@ -512,64 +512,64 @@ namespace dart { // A list of core functions that internally dispatch based on received id. #define POLYMORPHIC_TARGET_LIST(V) \ - V(_StringBase, [], StringBaseCharAt, 0xd0613adf) \ - V(_TypedList, _getInt8, TypedList_GetInt8, 0x16155415) \ - V(_TypedList, _getUint8, TypedList_GetUint8, 0x1771760b) \ - V(_TypedList, _getInt16, TypedList_GetInt16, 0x2e320e30) \ - V(_TypedList, _getUint16, TypedList_GetUint16, 0x2fb36e9a) \ - V(_TypedList, _getInt32, TypedList_GetInt32, 0x1909a4eb) \ - V(_TypedList, _getUint32, TypedList_GetUint32, 0x194ee65c) \ - V(_TypedList, _getInt64, TypedList_GetInt64, 0xf65237e0) \ - V(_TypedList, _getUint64, TypedList_GetUint64, 0x2c4cf13a) \ - V(_TypedList, _getFloat32, TypedList_GetFloat32, 0xe8e818e8) \ - V(_TypedList, _getFloat64, TypedList_GetFloat64, 0xf81bae15) \ - V(_TypedList, _getFloat32x4, TypedList_GetFloat32x4, 0xaf1e84c6) \ - V(_TypedList, _getInt32x4, TypedList_GetInt32x4, 0x5564ebec) \ - V(_TypedList, _setInt8, TypedList_SetInt8, 0xe17abb83) \ - V(_TypedList, _setUint8, TypedList_SetInt8, 0xaf4b2f29) \ - V(_TypedList, _setInt16, TypedList_SetInt16, 0xbad7b808) \ - V(_TypedList, _setUint16, TypedList_SetInt16, 0xce13c030) \ - V(_TypedList, _setInt32, TypedList_SetInt32, 0xbdcc2321) \ - V(_TypedList, _setUint32, TypedList_SetUint32, 0xb9581b93) \ - V(_TypedList, _setInt64, TypedList_SetInt64, 0xc8bec75b) \ - V(_TypedList, _setUint64, TypedList_SetUint64, 0xda38a9e6) \ - V(_TypedList, _setFloat32, TypedList_SetFloat32, 0x2f27a5c1) \ - V(_TypedList, _setFloat64, TypedList_SetFloat64, 0x234b70b3) \ - V(_TypedList, _setFloat32x4, TypedList_SetFloat32x4, 0x38b7a13b) \ - V(_TypedList, _setInt32x4, TypedList_SetInt32x4, 0x5cda7a3c) \ - V(Object, get:runtimeType, ObjectRuntimeType, 0x03733c71) + V(_StringBase, [], StringBaseCharAt, 0xd052aeff) \ + V(_TypedList, _getInt8, TypedList_GetInt8, 0x1606c835) \ + V(_TypedList, _getUint8, TypedList_GetUint8, 0x1762ea2b) \ + V(_TypedList, _getInt16, TypedList_GetInt16, 0x2e238250) \ + V(_TypedList, _getUint16, TypedList_GetUint16, 0x2fa4e2ba) \ + V(_TypedList, _getInt32, TypedList_GetInt32, 0x18fb190b) \ + V(_TypedList, _getUint32, TypedList_GetUint32, 0x19405a7c) \ + V(_TypedList, _getInt64, TypedList_GetInt64, 0xf643ac00) \ + V(_TypedList, _getUint64, TypedList_GetUint64, 0x2c3e655a) \ + V(_TypedList, _getFloat32, TypedList_GetFloat32, 0xe8d98d08) \ + V(_TypedList, _getFloat64, TypedList_GetFloat64, 0xf80d2235) \ + V(_TypedList, _getFloat32x4, TypedList_GetFloat32x4, 0xaf0ff8e6) \ + V(_TypedList, _getInt32x4, TypedList_GetInt32x4, 0x5556600c) \ + V(_TypedList, _setInt8, TypedList_SetInt8, 0xe16c2fa3) \ + V(_TypedList, _setUint8, TypedList_SetInt8, 0xaf3ca349) \ + V(_TypedList, _setInt16, TypedList_SetInt16, 0xbac92c28) \ + V(_TypedList, _setUint16, TypedList_SetInt16, 0xce053450) \ + V(_TypedList, _setInt32, TypedList_SetInt32, 0xbdbd9741) \ + V(_TypedList, _setUint32, TypedList_SetUint32, 0xb9498fb3) \ + V(_TypedList, _setInt64, TypedList_SetInt64, 0xc8b03b7b) \ + V(_TypedList, _setUint64, TypedList_SetUint64, 0xda2a1e06) \ + V(_TypedList, _setFloat32, TypedList_SetFloat32, 0x2f1919e1) \ + V(_TypedList, _setFloat64, TypedList_SetFloat64, 0x233ce4d3) \ + V(_TypedList, _setFloat32x4, TypedList_SetFloat32x4, 0x38a9155b) \ + V(_TypedList, _setInt32x4, TypedList_SetInt32x4, 0x5ccbee5c) \ + V(Object, get:runtimeType, ObjectRuntimeType, 0x0364b091) // List of recognized list factories: // (factory-name-symbol, class-name-string, constructor-name-string, // result-cid, fingerprint). #define RECOGNIZED_LIST_FACTORY_LIST(V) \ - V(_ListFactory, _List, ., kArrayCid, 0x4c8eae02) \ - V(_ListFilledFactory, _List, .filled, kArrayCid, 0x92756a31) \ - V(_ListGenerateFactory, _List, .generate, kArrayCid, 0x428498ce) \ + V(_ListFactory, _List, ., kArrayCid, 0x4c802222) \ + V(_ListFilledFactory, _List, .filled, kArrayCid, 0x9266de51) \ + V(_ListGenerateFactory, _List, .generate, kArrayCid, 0x42760cee) \ V(_GrowableListFactory, _GrowableList, ., kGrowableObjectArrayCid, \ - 0x3c90606d) \ + 0x3c81d48d) \ V(_GrowableListFilledFactory, _GrowableList, .filled, \ - kGrowableObjectArrayCid, 0xeae18bb1) \ + kGrowableObjectArrayCid, 0xead2ffd1) \ V(_GrowableListGenerateFactory, _GrowableList, .generate, \ - kGrowableObjectArrayCid, 0x7be49a4e) \ + kGrowableObjectArrayCid, 0x7bd60e6e) \ V(_GrowableListWithData, _GrowableList, ._withData, kGrowableObjectArrayCid, \ - 0x19394cc1) \ - V(_Int8ArrayFactory, Int8List, ., kTypedDataInt8ArrayCid, 0x65ff48e7) \ - V(_Uint8ArrayFactory, Uint8List, ., kTypedDataUint8ArrayCid, 0xedd566ae) \ + 0x192ac0e1) \ + V(_Int8ArrayFactory, Int8List, ., kTypedDataInt8ArrayCid, 0x65f0bd07) \ + V(_Uint8ArrayFactory, Uint8List, ., kTypedDataUint8ArrayCid, 0xedc6dace) \ V(_Uint8ClampedArrayFactory, Uint8ClampedList, ., \ - kTypedDataUint8ClampedArrayCid, 0x27f7a7b4) \ - V(_Int16ArrayFactory, Int16List, ., kTypedDataInt16ArrayCid, 0xd0bf0952) \ - V(_Uint16ArrayFactory, Uint16List, ., kTypedDataUint16ArrayCid, 0x3ca76bc9) \ - V(_Int32ArrayFactory, Int32List, ., kTypedDataInt32ArrayCid, 0x1b81637f) \ - V(_Uint32ArrayFactory, Uint32List, ., kTypedDataUint32ArrayCid, 0x2b210aea) \ - V(_Int64ArrayFactory, Int64List, ., kTypedDataInt64ArrayCid, 0xfb634e8e) \ - V(_Uint64ArrayFactory, Uint64List, ., kTypedDataUint64ArrayCid, 0xe3c14057) \ + kTypedDataUint8ClampedArrayCid, 0x27e91bd4) \ + V(_Int16ArrayFactory, Int16List, ., kTypedDataInt16ArrayCid, 0xd0b07d72) \ + V(_Uint16ArrayFactory, Uint16List, ., kTypedDataUint16ArrayCid, 0x3c98dfe9) \ + V(_Int32ArrayFactory, Int32List, ., kTypedDataInt32ArrayCid, 0x1b72d79f) \ + V(_Uint32ArrayFactory, Uint32List, ., kTypedDataUint32ArrayCid, 0x2b127f0a) \ + V(_Int64ArrayFactory, Int64List, ., kTypedDataInt64ArrayCid, 0xfb54c2ae) \ + V(_Uint64ArrayFactory, Uint64List, ., kTypedDataUint64ArrayCid, 0xe3b2b477) \ V(_Float64ArrayFactory, Float64List, ., kTypedDataFloat64ArrayCid, \ - 0xa0b7bef0) \ + 0xa0a93310) \ V(_Float32ArrayFactory, Float32List, ., kTypedDataFloat32ArrayCid, \ - 0xa381d95d) \ + 0xa3734d7d) \ V(_Float32x4ArrayFactory, Float32x4List, ., kTypedDataFloat32x4ArrayCid, \ - 0x0a6eebe7) + 0x0a606007) // clang-format on diff --git a/runtime/vm/kernel_binary.h b/runtime/vm/kernel_binary.h index b7eab89f968..312eed35ea4 100644 --- a/runtime/vm/kernel_binary.h +++ b/runtime/vm/kernel_binary.h @@ -18,7 +18,7 @@ namespace kernel { // package:kernel/binary.md. static const uint32_t kMagicProgramFile = 0x90ABCDEFu; -static const uint32_t kSupportedKernelFormatVersion = 116; +static const uint32_t kSupportedKernelFormatVersion = 117; // Keep in sync with package:kernel/lib/binary/tag.dart #define KERNEL_TAG_LIST(V) \ @@ -233,13 +233,13 @@ enum AsExpressionFlags { kAsExpressionFlagTypeError = 1 << 0, kAsExpressionFlagCovarianceCheck = 1 << 1, kAsExpressionFlagForDynamic = 1 << 2, - kAsExpressionFlagForNonNullableByDefault = 1 << 3, + kAsExpressionFlagForLegacy = 1 << 3, kAsExpressionFlagUnchecked = 1 << 4, }; // Keep in sync with package:kernel/lib/ast.dart enum IsExpressionFlags { - kIsExpressionFlagForNonNullableByDefault = 1 << 0, + kIsExpressionFlagForLegacy = 1 << 0, }; // Keep in sync with package:kernel/lib/ast.dart diff --git a/runtime/vm/object.h b/runtime/vm/object.h index 0c3a576eea5..6c1cbbc4290 100644 --- a/runtime/vm/object.h +++ b/runtime/vm/object.h @@ -1130,8 +1130,8 @@ enum class NNBDMode { // The NNBDCompiledMode reflects the mode in which constants of the library were // compiled by CFE. enum class NNBDCompiledMode { - kWeak = 0, - kStrong = 1, + kStrong = 0, + kWeak = 1, kAgnostic = 2, kInvalid = 3, }; diff --git a/utils/compiler/BUILD.gn b/utils/compiler/BUILD.gn index 2fdba1a7ca0..45f20f0a044 100644 --- a/utils/compiler/BUILD.gn +++ b/utils/compiler/BUILD.gn @@ -102,6 +102,7 @@ compile_platform("compile_dart2js_platform_unsound") { "--target=dart2js", "--no-defines", "dart:core", + "--nnbd-weak", ] } compile_platform("compile_dart2js_platform") { @@ -118,7 +119,6 @@ compile_platform("compile_dart2js_platform") { "--target=dart2js", "--no-defines", "dart:core", - "--nnbd-strong", ] } compile_platform("compile_dart2js_server_platform_unsound") { @@ -135,6 +135,7 @@ compile_platform("compile_dart2js_server_platform_unsound") { "--target=dart2js_server", "--no-defines", "dart:core", + "--nnbd-weak", ] } compile_platform("compile_dart2js_server_platform") { @@ -151,6 +152,5 @@ compile_platform("compile_dart2js_server_platform") { "--target=dart2js_server", "--no-defines", "dart:core", - "--nnbd-strong", ] }