Version 2.19.0-429.0.dev

Dart CI · Dart CI · commit eddf73d66119 · 2022-11-24T08:09:58.000-08:00
Merge 722109d into dev
diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -83,7 +83,6 @@ import '../fasta_codes.dart'
         templateExperimentNotEnabledOffByDefault;
 import '../identifiers.dart'
     show Identifier, InitializedIdentifier, QualifiedName, flattenName;
-import '../messages.dart' as messages show getLocationFromUri;
 import '../modifier.dart'
     show Modifier, constMask, covariantMask, finalMask, lateMask, requiredMask;
 import '../names.dart' show emptyName, minusName, plusName;
@@ -7608,25 +7607,8 @@ class BodyBuilder extends StackListenerImpl
 
   Expression buildFallThroughError(int charOffset) {
     addProblem(fasta.messageSwitchCaseFallThrough, charOffset, noLength);
-
-    // TODO(ahe): The following doesn't make sense for the Analyzer. It should
-    // be moved to [Forest] or conditional on `forest is Fangorn`.
-
-    // TODO(ahe): Compute a LocatedMessage above instead?
-    Location? location = messages.getLocationFromUri(uri, charOffset);
-
-    return forest.createThrow(
-        charOffset,
-        buildStaticInvocation(
-            libraryBuilder
-                .loader.coreTypes.fallThroughErrorUrlAndLineConstructor,
-            forest.createArguments(noLocation, <Expression>[
-              forest.createStringLiteral(
-                  charOffset, "${location?.file ?? uri}"),
-              forest.createIntLiteral(charOffset, location?.line ?? 0),
-            ]),
-            constness: Constness.explicitNew,
-            charOffset: charOffset));
+    return new InvalidExpression(
+        fasta.messageSwitchCaseFallThrough.problemMessage);
   }
 
   Expression buildAbstractClassInstantiationError(
diff --git a/pkg/front_end/testcases/general/fallthrough.dart.weak.expect b/pkg/front_end/testcases/general/fallthrough.dart.weak.expect
@@ -21,7 +21,7 @@ static method main(core::List<core::String*>* args) → void {
     case #C1:
       {
         x = 4;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///fallthrough.dart", 10);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L3:
     case #C2:
@@ -38,7 +38,7 @@ static method main(core::List<core::String*>* args) → void {
         else {
           return;
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///fallthrough.dart", 14);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L5:
     case #C5:
diff --git a/pkg/front_end/testcases/general/fallthrough.dart.weak.modular.expect b/pkg/front_end/testcases/general/fallthrough.dart.weak.modular.expect
@@ -21,7 +21,7 @@ static method main(core::List<core::String*>* args) → void {
     case #C1:
       {
         x = 4;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///fallthrough.dart", 10);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L3:
     case #C2:
@@ -38,7 +38,7 @@ static method main(core::List<core::String*>* args) → void {
         else {
           return;
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///fallthrough.dart", 14);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L5:
     case #C5:
diff --git a/pkg/front_end/testcases/general/fallthrough.dart.weak.transformed.expect b/pkg/front_end/testcases/general/fallthrough.dart.weak.transformed.expect
@@ -21,7 +21,7 @@ static method main(core::List<core::String*>* args) → void {
     case #C1:
       {
         x = 4;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///fallthrough.dart", 10);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L3:
     case #C2:
@@ -38,7 +38,7 @@ static method main(core::List<core::String*>* args) → void {
         else {
           return;
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///fallthrough.dart", 14);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L5:
     case #C5:
diff --git a/pkg/front_end/testcases/rasta/switch_execution_case_t01.dart.weak.expect b/pkg/front_end/testcases/rasta/switch_execution_case_t01.dart.weak.expect
@@ -31,13 +31,13 @@ static method test(dynamic value) → dynamic {
     case #C2:
       {
         result = 2;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_execution_case_t01.dart", 37);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L4:
     case #C3:
       {
         result = 3;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_execution_case_t01.dart", 38);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L5:
     default:
@@ -56,7 +56,7 @@ static method testEmptyCases(dynamic value) → dynamic {
     case #C2:
       {
         result = 1;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_execution_case_t01.dart", 48);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L8:
     case #C3:
diff --git a/pkg/front_end/testcases/rasta/switch_execution_case_t01.dart.weak.modular.expect b/pkg/front_end/testcases/rasta/switch_execution_case_t01.dart.weak.modular.expect
@@ -31,13 +31,13 @@ static method test(dynamic value) → dynamic {
     case #C2:
       {
         result = 2;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_execution_case_t01.dart", 37);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L4:
     case #C3:
       {
         result = 3;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_execution_case_t01.dart", 38);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L5:
     default:
@@ -56,7 +56,7 @@ static method testEmptyCases(dynamic value) → dynamic {
     case #C2:
       {
         result = 1;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_execution_case_t01.dart", 48);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L8:
     case #C3:
diff --git a/pkg/front_end/testcases/rasta/switch_execution_case_t01.dart.weak.transformed.expect b/pkg/front_end/testcases/rasta/switch_execution_case_t01.dart.weak.transformed.expect
@@ -31,13 +31,13 @@ static method test(dynamic value) → dynamic {
     case #C2:
       {
         result = 2;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_execution_case_t01.dart", 37);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L4:
     case #C3:
       {
         result = 3;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_execution_case_t01.dart", 38);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L5:
     default:
@@ -56,7 +56,7 @@ static method testEmptyCases(dynamic value) → dynamic {
     case #C2:
       {
         result = 1;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_execution_case_t01.dart", 48);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L8:
     case #C3:
diff --git a/pkg/front_end/testcases/rasta/switch_fall_through.dart b/pkg/front_end/testcases/rasta/switch_fall_through.dart
@@ -4,7 +4,7 @@
 
 // @dart=2.9
 
-main() {
+test() {
   switch (1) {
     case 1:
       {
diff --git a/pkg/front_end/testcases/rasta/switch_fall_through.dart.textual_outline.expect b/pkg/front_end/testcases/rasta/switch_fall_through.dart.textual_outline.expect
@@ -1,2 +1,2 @@
 // @dart = 2.9
-main() {}
+test() {}
diff --git a/pkg/front_end/testcases/rasta/switch_fall_through.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/rasta/switch_fall_through.dart.textual_outline_modelled.expect
@@ -1,2 +1,2 @@
 // @dart = 2.9
-main() {}
+test() {}
diff --git a/pkg/front_end/testcases/rasta/switch_fall_through.dart.weak.expect b/pkg/front_end/testcases/rasta/switch_fall_through.dart.weak.expect
@@ -25,7 +25,7 @@ library;
 import self as self;
 import "dart:core" as core;
 
-static method main() → dynamic {
+static method test() → dynamic {
   #L1:
   switch(1) {
     #L2:
@@ -36,7 +36,7 @@ static method main() → dynamic {
           break #L1;
           ;
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 9);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L3:
     case #C2:
@@ -47,7 +47,7 @@ static method main() → dynamic {
             break #L1;
           }
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 15);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L4:
     case #C3:
@@ -58,7 +58,7 @@ static method main() → dynamic {
         finally {
           break #L1;
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 22);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L5:
     case #C4:
@@ -69,7 +69,7 @@ static method main() → dynamic {
         }
         finally {
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 28);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L6:
     case #C5:
@@ -79,7 +79,7 @@ static method main() → dynamic {
         }
         finally {
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 33);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L7:
     case #C6:
diff --git a/pkg/front_end/testcases/rasta/switch_fall_through.dart.weak.modular.expect b/pkg/front_end/testcases/rasta/switch_fall_through.dart.weak.modular.expect
@@ -25,7 +25,7 @@ library;
 import self as self;
 import "dart:core" as core;
 
-static method main() → dynamic {
+static method test() → dynamic {
   #L1:
   switch(1) {
     #L2:
@@ -36,7 +36,7 @@ static method main() → dynamic {
           break #L1;
           ;
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 9);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L3:
     case #C2:
@@ -47,7 +47,7 @@ static method main() → dynamic {
             break #L1;
           }
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 15);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L4:
     case #C3:
@@ -58,7 +58,7 @@ static method main() → dynamic {
         finally {
           break #L1;
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 22);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L5:
     case #C4:
@@ -69,7 +69,7 @@ static method main() → dynamic {
         }
         finally {
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 28);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L6:
     case #C5:
@@ -79,7 +79,7 @@ static method main() → dynamic {
         }
         finally {
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 33);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L7:
     case #C6:
diff --git a/pkg/front_end/testcases/rasta/switch_fall_through.dart.weak.outline.expect b/pkg/front_end/testcases/rasta/switch_fall_through.dart.weak.outline.expect
@@ -1,5 +1,5 @@
 library;
 import self as self;
 
-static method main() → dynamic
+static method test() → dynamic
   ;
diff --git a/pkg/front_end/testcases/rasta/switch_fall_through.dart.weak.transformed.expect b/pkg/front_end/testcases/rasta/switch_fall_through.dart.weak.transformed.expect
@@ -25,7 +25,7 @@ library;
 import self as self;
 import "dart:core" as core;
 
-static method main() → dynamic {
+static method test() → dynamic {
   #L1:
   switch(1) {
     #L2:
@@ -36,7 +36,7 @@ static method main() → dynamic {
           break #L1;
           ;
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 9);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L3:
     case #C2:
@@ -47,7 +47,7 @@ static method main() → dynamic {
             break #L1;
           }
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 15);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L4:
     case #C3:
@@ -58,7 +58,7 @@ static method main() → dynamic {
         finally {
           break #L1;
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 22);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L5:
     case #C4:
@@ -69,7 +69,7 @@ static method main() → dynamic {
         }
         finally {
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 28);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L6:
     case #C5:
@@ -79,7 +79,7 @@ static method main() → dynamic {
         }
         finally {
         }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_fall_through.dart", 33);
+        invalid-expression "Switch case may fall through to the next case.";
       }
     #L7:
     case #C6:
diff --git a/pkg/front_end/testcases/weak.status b/pkg/front_end/testcases/weak.status
@@ -13,6 +13,7 @@ dart2js/late_fields_with_annotation: SemiFuzzFailure # https://github.com/dart-l
 dart2js/mixin_super/main: SemiFuzzFailure # https://github.com/dart-lang/sdk/issues/49339
 dart2js/tear_off_patch/main: semiFuzzFailureOnForceRebuildBodies # needs custom libraries.json (and platform?) not setup here
 general/constants/with_unevaluated_agnostic/various_2: SemiFuzzFailure # Looks similar to https://dart-review.googlesource.com/c/sdk/+/242441
+general/fallthrough: RuntimeError # Fallthrough cases in switch.
 general/issue48765: semiFuzzFailureOnForceRebuildBodies # private class
 general/mixin_from_patch/main: semiFuzzFailureOnForceRebuildBodies # needs custom libraries.json (and platform?) not setup here
 general/multiple_class_patches/main: semiFuzzFailureOnForceRebuildBodies # needs custom libraries.json (and platform?) not setup here
@@ -32,17 +33,17 @@ macros/augment_concrete: SemiFuzzFailure # https://github.com/dart-lang/sdk/issu
 macros/extend_augmented: SemiFuzzFailure # Similar to https://github.com/dart-lang/sdk/issues/49414
 macros/multiple_augment_class: SemiFuzzFailure # https://github.com/dart-lang/sdk/issues/49990
 macros/multiple_imports: SemiFuzzFailure # probably augment imports that isn't split correctly.
+nnbd/constants: SemiFuzzFailure # Looks similar to https://dart-review.googlesource.com/c/sdk/+/242441
 nnbd_mixed/hierarchy/in_dill_out_in/in_out_in: SemiFuzzFailure # lots of stuff --- not digging in for now
 nnbd_mixed/hierarchy/in_out_dill_in/in_out_in: SemiFuzzFailure # lots of stuff --- not digging in for now
 nnbd_mixed/hierarchy/in_out_in: SemiFuzzFailure # lots of stuff --- not digging in for now
-nnbd_mixed/issue43988/main: SemiFuzzFailure # https://dart-review.googlesource.com/c/sdk/+/242540 and https://dart-review.googlesource.com/c/sdk/+/242446
 nnbd_mixed/issue43988/main.no_link: SemiFuzzFailure # https://dart-review.googlesource.com/c/sdk/+/242540 and https://dart-review.googlesource.com/c/sdk/+/242446
+nnbd_mixed/issue43988/main: SemiFuzzFailure # https://dart-review.googlesource.com/c/sdk/+/242540 and https://dart-review.googlesource.com/c/sdk/+/242446
 nnbd_mixed/member_inheritance_from_opt_in: SemiFuzzFailure # https://dart-review.googlesource.com/c/sdk/+/242446
 nnbd_mixed/mixed_mixin: SemiFuzzFailure
-nnbd/constants: SemiFuzzFailure # Looks similar to https://dart-review.googlesource.com/c/sdk/+/242441
+no_such_method_forwarders/abstract_accessors_from_field: SemiFuzzFailure # Looks similar to https://dart-review.googlesource.com/c/sdk/+/242444
 no_such_method_forwarders/abstract_accessors_from_field_one_defined: SemiFuzzFailure # Looks similar to https://dart-review.googlesource.com/c/sdk/+/242444
 no_such_method_forwarders/abstract_accessors_from_field_with_substitution: SemiFuzzFailure # Looks similar to https://dart-review.googlesource.com/c/sdk/+/242444
-no_such_method_forwarders/abstract_accessors_from_field: SemiFuzzFailure # Looks similar to https://dart-review.googlesource.com/c/sdk/+/242444
 no_such_method_forwarders/abstract_override_abstract_different_type: SemiFuzzFailure
 no_such_method_forwarders/abstract_override_with_different_signature: SemiFuzzFailure
 no_such_method_forwarders/default_argument_values: SemiFuzzFailure # Looks similar to https://dart-review.googlesource.com/c/sdk/+/242444
diff --git a/tools/VERSION b/tools/VERSION
@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 2
 MINOR 19
 PATCH 0
-PRERELEASE 428
+PRERELEASE 429
 PRERELEASE_PATCH 0

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ static method main(core::List<core::String> args) → void {`
`21`	`21`	`case #C1:`
`22`	`22`	`{`
`23`	`23`	`x = 4;`
`24`		`- throw new core::FallThroughError::_create("org-dartlang-testcase:///fallthrough.dart", 10);`
	`24`	`+ invalid-expression "Switch case may fall through to the next case.";`
`25`	`25`	`}`
`26`	`26`	`#L3:`
`27`	`27`	`case #C2:`
`@@ -38,7 +38,7 @@ static method main(core::List<core::String> args) → void {`
`38`	`38`	`else {`
`39`	`39`	`return;`
`40`	`40`	`}`
`41`		`- throw new core::FallThroughError::_create("org-dartlang-testcase:///fallthrough.dart", 14);`
	`41`	`+ invalid-expression "Switch case may fall through to the next case.";`
`42`	`42`	`}`
`43`	`43`	`#L5:`
`44`	`44`	`case #C5:`
Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,13 @@ static method test(dynamic value) → dynamic {`
`31`	`31`	`case #C2:`
`32`	`32`	`{`
`33`	`33`	`result = 2;`
`34`		`- throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_execution_case_t01.dart", 37);`
	`34`	`+ invalid-expression "Switch case may fall through to the next case.";`
`35`	`35`	`}`
`36`	`36`	`#L4:`
`37`	`37`	`case #C3:`
`38`	`38`	`{`
`39`	`39`	`result = 3;`
`40`		`- throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_execution_case_t01.dart", 38);`
	`40`	`+ invalid-expression "Switch case may fall through to the next case.";`
`41`	`41`	`}`
`42`	`42`	`#L5:`
`43`	`43`	`default:`
`@@ -56,7 +56,7 @@ static method testEmptyCases(dynamic value) → dynamic {`
`56`	`56`	`case #C2:`
`57`	`57`	`{`
`58`	`58`	`result = 1;`
`59`		`- throw new core::FallThroughError::_create("org-dartlang-testcase:///switch_execution_case_t01.dart", 48);`
	`59`	`+ invalid-expression "Switch case may fall through to the next case.";`
`60`	`60`	`}`
`61`	`61`	`#L8:`
`62`	`62`	`case #C3:`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`// @dart=2.9`
`6`	`6`
`7`		`-main() {`
	`7`	`+test() {`
`8`	`8`	`switch (1) {`
`9`	`9`	`case 1:`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`// @dart = 2.9`
`2`		`-main() {}`
	`2`	`+test() {}`