[region-isolation] Remove count of emitted diagnostics from main diagnostic.

These are not actionable to the user.

Author: gottesmm

include/swift/AST/DiagnosticsSIL.def

@@ -883,8 +883,8 @@ WARNING(transfer_yields_race, none,
         "non-sendable value sent across isolation domains that could be concurrently accessed later in this function (%0 access site%select{|s}1 displayed%select{|, %3 more hidden}2)",
         (unsigned, bool, bool, unsigned))
 WARNING(call_site_transfer_yields_race, none,
-        "passing argument of non-sendable type %0 from %1 context to %2 context at this call site could yield a race with accesses later in this function (%3 access site%select{|s}4 displayed%select{|, %6 more hidden}5)",
-        (Type, ActorIsolation, ActorIsolation, unsigned, bool, bool, unsigned))
+        "passing argument of non-sendable type %0 from %1 context to %2 context at this call site could yield a race with accesses later in this function",
+        (Type, ActorIsolation, ActorIsolation))
 NOTE(possible_racy_access_site, none,
      "access here could race", ())
 

lib/SILOptimizer/Mandatory/TransferNonSendable.cpp

@@ -1594,13 +1594,13 @@ class TransferRequireAccumulator {
 
   void accumulateTransferredReason(PartitionOp requireOp,
                                    const TransferredReason &transferredReason) {
-    for (auto [distance, transferOp] : transferredReason.transferOps)
+    for (auto &[distance, transferOp] : transferredReason.transferOps)
       requirementsForTransfers[transferOp].insert({requireOp, distance});
   }
 
   void emitErrorsForTransferRequire(
       unsigned numRequiresPerTransfer = UINT_MAX) const {
-    for (auto [transferOp, requireOps] : requirementsForTransfers) {
+    for (auto &[transferOp, requireOps] : requirementsForTransfers) {
       unsigned numProcessed = std::min(
           {(unsigned)requireOps.size(), (unsigned)numRequiresPerTransfer});
 
@@ -1637,7 +1637,7 @@ class TransferRequireAccumulator {
   SWIFT_DEBUG_DUMP { print(llvm::dbgs()); }
 
   void print(llvm::raw_ostream &os) const {
-    for (auto [transferOp, requireOps] : requirementsForTransfers) {
+    for (auto &[transferOp, requireOps] : requirementsForTransfers) {
       os << " ┌──╼ TRANSFER: ";
       transferOp.print(os);
 
@@ -1675,8 +1675,7 @@ class TransferRequireAccumulator {
         .diagnose(argExpr->getLoc(), diag::call_site_transfer_yields_race,
                   argExpr->findOriginalType(),
                   isolationCrossing.value().getCallerIsolation(),
-                  isolationCrossing.value().getCalleeIsolation(), numDisplayed,
-                  numDisplayed != 1, numHidden > 0, numHidden)
+                  isolationCrossing.value().getCalleeIsolation())
         .highlight(argExpr->getSourceRange());
     return true;
   }
@@ -2178,8 +2177,7 @@ class PartitionAnalysis {
         .diagnose(argExpr->getLoc(), diag::call_site_transfer_yields_race,
                   argExpr->findOriginalType(),
                   isolationCrossing.value().getCallerIsolation(),
-                  isolationCrossing.value().getCalleeIsolation(), numDisplayed,
-                  numDisplayed != 1, numHidden > 0, numHidden)
+                  isolationCrossing.value().getCalleeIsolation())
         .highlight(argExpr->getSourceRange());
     return true;
   }

test/Concurrency/sendable_checking.swift

@@ -252,7 +252,7 @@ final class NonSendable {
     await update()
     // expected-targeted-and-complete-warning @-1 {{passing argument of non-sendable type 'NonSendable' into main actor-isolated context may introduce data races}}
     // expected-tns-warning@-2 {{call site passes `self` or a non-sendable argument of this function to another thread, potentially yielding a race with the caller}}
-    // expected-tns-warning@-3 {{passing argument of non-sendable type 'NonSendable' from nonisolated context to main actor-isolated context at this call site could yield a race with accesses later in this function (3 access sites displayed)}}
+    // expected-tns-warning@-3 {{passing argument of non-sendable type 'NonSendable' from nonisolated context to main actor-isolated context at this call site could yield a race with accesses later in this function}}
 
 
     await self.update()
@@ -277,7 +277,7 @@ func testNonSendableBaseArg() async {
   let t = NonSendable()
   await t.update()
   // expected-targeted-and-complete-warning @-1 {{passing argument of non-sendable type 'NonSendable' into main actor-isolated context may introduce data races}}
-  // expected-tns-warning@-2 {{passing argument of non-sendable type 'NonSendable' from nonisolated context to main actor-isolated context at this call site could yield a race with accesses later in this function (1 access site displayed)}}
+  // expected-tns-warning@-2 {{passing argument of non-sendable type 'NonSendable' from nonisolated context to main actor-isolated context at this call site could yield a race with accesses later in this function}}
 
   _ = await t.x
   // expected-warning @-1 {{non-sendable type 'NonSendable' passed in implicitly asynchronous call to main actor-isolated property 'x' cannot cross actor boundary}}
@@ -297,7 +297,7 @@ func callNonisolatedAsyncClosure(
   await g(ns)
   // expected-targeted-and-complete-warning@-1 {{passing argument of non-sendable type 'NonSendable' outside of main actor-isolated context may introduce data races}}
   // expected-tns-warning@-2 {{call site passes `self` or a non-sendable argument of this function to another thread, potentially yielding a race with the caller}}
-  // expected-tns-warning@-3 {{passing argument of non-sendable type 'NonSendable' from main actor-isolated context to nonisolated context at this call site could yield a race with accesses later in this function (1 access site displayed)}}
+  // expected-tns-warning@-3 {{passing argument of non-sendable type 'NonSendable' from main actor-isolated context to nonisolated context at this call site could yield a race with accesses later in this function}}
 
   let f: (NonSendable) async -> () = globalSendable // okay
   await f(ns)