[cfe] Fix some CFE tests

Change-Id: I569e385a98514c66a6761fcf7825ae884ad71fc0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/413740
Commit-Queue: Johnni Winther <[email protected]>
Reviewed-by: Jens Johansen <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/compute_platform_binaries_location.dart

@@ -21,9 +21,8 @@ String? computePlatformDillName(Target target, void Function() onError) {
       // DDC is always compiled against the outline so we use it here by
       // default.
       return 'ddc_outline.dill';
-      // Coverage-ignore(suite): Not run.
-      //TODO(johnniwinther): Support using the full dill.
-      //return 'ddc_platform.dill';
+    //TODO(johnniwinther): Support using the full dill.
+    //return 'ddc_platform.dill';
     case 'dart2js':
       return 'dart2js_platform.dill';
     case 'dart2js_server':

pkg/front_end/lib/src/kernel/hierarchy/extension_type_members.dart

@@ -282,8 +282,13 @@ class ExtensionTypeMembersNode {
 
   ClassMember? getStaticMember(Name name, bool isSetter) {
     ClassMember? result = isSetter
-        ? (extensionTypeSetableMap?[name] ?? nonExtensionTypeSetableMap?[name])
-        : (extensionTypeGetableMap?[name] ?? nonExtensionTypeGetableMap?[name]);
+        ?
+        // Coverage-ignore(suite): Not run.
+        (extensionTypeSetableMap?[name] ?? nonExtensionTypeSetableMap?[name])
+        : (extensionTypeGetableMap?[name] ??
+            nonExtensionTypeGetableMap
+                // Coverage-ignore(suite): Not run.
+                ?[name]);
     if (result == null) {
       return null;
     } else if (result.isStatic) {

pkg/front_end/lib/src/kernel/hierarchy/members_node.dart

@@ -1189,8 +1189,11 @@ class ClassMembersNode {
   }
 
   ClassMember? getStaticMember(Name name, bool isSetter) {
-    ClassMember? result =
-        isSetter ? classSetterMap[name] : classMemberMap[name];
+    ClassMember? result = isSetter
+        ?
+        // Coverage-ignore(suite): Not run.
+        classSetterMap[name]
+        : classMemberMap[name];
     if (result == null) {
       return null;
     } else if (result.isStatic) {

pkg/front_end/lib/src/kernel/kernel_target.dart

@@ -787,6 +787,7 @@ class KernelTarget {
 
   String? _getLibraryNnbdModeError(Component component) {
     if (loader.hasInvalidNnbdModeLibrary) {
+      // Coverage-ignore-block(suite): Not run.
       // At least 1 library should be invalid or there should be a mix of strong
       // and weak. For libraries we've just compiled it will be marked as
       // invalid, but for libraries loaded from dill they have their original

pkg/front_end/lib/src/source/source_loader.dart

@@ -618,6 +618,7 @@ class SourceLoader extends Loader {
           libraryBuilder, messageInvalidNnbdDillLibrary);
     } else {
       if (libraryMode != NonNullableByDefaultCompiledMode.Strong) {
+        // Coverage-ignore-block(suite): Not run.
         registerNnbdMismatchLibrary(
             libraryBuilder, messageStrongWithWeakDillLibrary);
       }
@@ -1098,6 +1099,7 @@ severity: $severity
 
   Map<LibraryBuilder, Message>? _nnbdMismatchLibraries;
 
+  // Coverage-ignore(suite): Not run.
   void registerNnbdMismatchLibrary(
       LibraryBuilder libraryBuilder, Message message) {
     _nnbdMismatchLibraries ??= {};
@@ -1136,6 +1138,7 @@ severity: $severity
     currentUriForCrashReporting = null;
     logSummary(outlineSummaryTemplate);
     if (_nnbdMismatchLibraries != null) {
+      // Coverage-ignore-block(suite): Not run.
       for (MapEntry<LibraryBuilder, Message> entry
           in _nnbdMismatchLibraries!.entries) {
         addProblem(entry.value, -1, noLength, entry.key.fileUri);

pkg/front_end/test/coverage_suite_expected.dart

@@ -150,7 +150,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/base/incremental_compiler.dart": (
-    hitCount: 850,
+    hitCount: 846,
     missCount: 0,
   ),
   // 100.0%.
@@ -205,7 +205,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/base/processed_options.dart": (
-    hitCount: 260,
+    hitCount: 251,
     missCount: 0,
   ),
   // 100.0%.
@@ -405,7 +405,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/compute_platform_binaries_location.dart": (
-    hitCount: 49,
+    hitCount: 46,
     missCount: 0,
   ),
   // 100.0%.
@@ -625,7 +625,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/kernel/constant_evaluator.dart": (
-    hitCount: 3730,
+    hitCount: 3697,
     missCount: 0,
   ),
   // 100.0%.
@@ -680,7 +680,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/kernel/hierarchy/extension_type_members.dart": (
-    hitCount: 388,
+    hitCount: 393,
     missCount: 0,
   ),
   // 100.0%.
@@ -695,7 +695,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/kernel/hierarchy/members_builder.dart": (
-    hitCount: 133,
+    hitCount: 136,
     missCount: 0,
   ),
   // 100.0%.
@@ -740,7 +740,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/kernel/kernel_target.dart": (
-    hitCount: 1044,
+    hitCount: 1017,
     missCount: 0,
   ),
   // 100.0%.
@@ -750,7 +750,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/kernel/late_lowering.dart": (
-    hitCount: 368,
+    hitCount: 362,
     missCount: 0,
   ),
   // 100.0%.
@@ -805,7 +805,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/kernel_generator_impl.dart": (
-    hitCount: 47,
+    hitCount: 46,
     missCount: 0,
   ),
   // 100.0%.
@@ -860,17 +860,17 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/source/source_class_builder.dart": (
-    hitCount: 1399,
+    hitCount: 1398,
     missCount: 0,
   ),
   // 100.0%.
   "package:front_end/src/source/source_compilation_unit.dart": (
-    hitCount: 674,
+    hitCount: 669,
     missCount: 0,
   ),
   // 100.0%.
   "package:front_end/src/source/source_constructor_builder.dart": (
-    hitCount: 699,
+    hitCount: 704,
     missCount: 0,
   ),
   // 100.0%.
@@ -880,7 +880,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/source/source_extension_builder.dart": (
-    hitCount: 159,
+    hitCount: 158,
     missCount: 0,
   ),
   // 100.0%.
@@ -891,7 +891,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/source/source_factory_builder.dart": (
-    hitCount: 1011,
+    hitCount: 1016,
     missCount: 0,
   ),
   // 100.0%.
@@ -906,7 +906,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/source/source_loader.dart": (
-    hitCount: 1819,
+    hitCount: 1792,
     missCount: 0,
   ),
   // 100.0%.
@@ -916,12 +916,12 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/source/source_method_builder.dart": (
-    hitCount: 229,
+    hitCount: 235,
     missCount: 0,
   ),
   // 100.0%.
   "package:front_end/src/source/source_property_builder.dart": (
-    hitCount: 678,
+    hitCount: 688,
     missCount: 0,
   ),
   // 100.0%.
@@ -991,7 +991,7 @@ const Map<String, ({int hitCount, int missCount})> _expect = {
   ),
   // 100.0%.
   "package:front_end/src/type_inference/matching_expressions.dart": (
-    hitCount: 521,
+    hitCount: 519,
     missCount: 0,
   ),
   // 100.0%.

pkg/front_end/testcases/expression/issue52905.expression.yaml.expect

@@ -24,7 +24,6 @@ method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr() →
           break #L1;
         }
       }
-      throw{for-error-handling} new dart._internal::ReachabilityError::•("`null` encountered as case in a switch expression with a non-nullable type.");
     }
   } =>#t1;
 constants  {

pkg/front_end/testcases/expression/lib_reference.expression.yaml.expect

@@ -1,4 +1,4 @@
 Errors: {
 }
 method /* from org-dartlang-debug:synthetic_debug_expression */ debugExpr() → dynamic
-  return let final Never #t1 = dart.io::exit(2) in throw{for-error-handling} new dart._internal::ReachabilityError::•("`null` encountered as the result from expression with type `Never`.");
+  return dart.io::exit(2);