Merge pull request #42459 from DougGregor/strict-concurrency-off

Disable implicit Sendable diagnostics via -strict-concurrency=off.

Author: DougGregor

lib/Sema/TypeCheckConcurrency.cpp

@@ -616,7 +616,7 @@ static bool shouldDiagnoseExistingDataRaces(const DeclContext *dc) {
 /// Determine the default diagnostic behavior for this language mode.
 static DiagnosticBehavior defaultSendableDiagnosticBehavior(
     const LangOptions &langOpts) {
-  // Prior to Swift 6, all Sendable-related diagnostics are warnings.
+  // Prior to Swift 6, all Sendable-related diagnostics are warnings at most.
   if (!langOpts.isSwiftVersionAtLeast(6))
     return DiagnosticBehavior::Warning;
 
@@ -648,6 +648,30 @@ DiagnosticBehavior SendableCheckContext::defaultDiagnosticBehavior() const {
   return defaultSendableDiagnosticBehavior(fromDC->getASTContext().LangOpts);
 }
 
+DiagnosticBehavior
+SendableCheckContext::implicitSendableDiagnosticBehavior() const {
+  switch (fromDC->getASTContext().LangOpts.StrictConcurrencyLevel) {
+  case StrictConcurrency::Limited:
+    // Limited checking only diagnoses implicit Sendable within contexts that
+    // have adopted concurrency.
+    if (shouldDiagnoseExistingDataRaces(fromDC))
+      return DiagnosticBehavior::Warning;
+
+    LLVM_FALLTHROUGH;
+
+  case StrictConcurrency::Off:
+    // Explicit Sendable conformances always diagnose, even when strict
+    // strict checking is disabled.
+    if (isExplicitSendableConformance())
+      return DiagnosticBehavior::Warning;
+
+    return DiagnosticBehavior::Ignore;
+
+  case StrictConcurrency::On:
+    return defaultDiagnosticBehavior();
+  }
+}
+
 /// Determine whether the given nominal type has an explicit Sendable
 /// conformance (regardless of its availability).
 static bool hasExplicitSendableConformance(NominalTypeDecl *nominal,
@@ -742,10 +766,10 @@ DiagnosticBehavior SendableCheckContext::diagnosticBehavior(
         : DiagnosticBehavior::Ignore;
   }
 
-  auto defaultBehavior = defaultDiagnosticBehavior();
+  DiagnosticBehavior defaultBehavior = implicitSendableDiagnosticBehavior();
 
   // If we are checking an implicit Sendable conformance, don't suppress
-  // diagnostics for declarations in the same module. We want them so make
+  // diagnostics for declarations in the same module. We want them to make
   // enclosing inferred types non-Sendable.
   if (defaultBehavior == DiagnosticBehavior::Ignore &&
       nominal->getParentSourceFile() &&
@@ -763,7 +787,7 @@ bool swift::diagnoseSendabilityErrorBasedOn(
   if (nominal) {
     behavior = fromContext.diagnosticBehavior(nominal);
   } else {
-    behavior = fromContext.defaultDiagnosticBehavior();
+    behavior = fromContext.implicitSendableDiagnosticBehavior();
   }
 
   bool wasSuppressed = diagnose(behavior);

lib/Sema/TypeCheckConcurrency.h

@@ -323,6 +323,9 @@ struct SendableCheckContext {
   /// Sendable conformance in this context.
   DiagnosticBehavior defaultDiagnosticBehavior() const;
 
+  /// Determine the diagnostic behavior for an implicitly non-Sendable type.
+  DiagnosticBehavior implicitSendableDiagnosticBehavior() const;
+
   /// Determine the diagnostic behavior when referencing the given nominal
   /// type in this context.
   DiagnosticBehavior diagnosticBehavior(NominalTypeDecl *nominal) const;

test/Concurrency/strict_concurrency_off.swift

@@ -0,0 +1,56 @@
+// RUN: %target-typecheck-verify-swift -strict-concurrency=off
+// REQUIRES: concurrency
+
+class C1 { }
+// expected-note@-1{{class 'C1' does not conform to the 'Sendable' protocol}}
+
+@_nonSendable class C2 { }
+// expected-note@-1 2{{class 'C2' does not conform to the 'Sendable' protocol}}
+
+class C3 { }
+// expected-note@-1 2{{class 'C3' does not conform to the 'Sendable' protocol}}
+
+@available(*, unavailable)
+extension C3: Sendable { }
+
+struct S1: Sendable {
+  let c1: C1 // expected-warning{{stored property 'c1' of 'Sendable'-conforming struct 'S1' has non-sendable type 'C1'}}
+  let c2: C2 // expected-warning{{stored property 'c2' of 'Sendable'-conforming struct 'S1' has non-sendable type 'C2'}}
+  let c3: C3 // expected-warning{{stored property 'c3'}}
+}
+
+struct S2 {
+  let c1: C1
+}
+
+struct S3 {
+  let c2: C2
+}
+
+
+func takeSendable(_ body: @Sendable () -> Void) {
+}
+
+@available(SwiftStdlib 5.1, *)
+func passSendable(
+    c1: C1, c2: C2, c3: C3, fn: @escaping () -> Void, s1: S1, s2: S2, s3: S3
+) async {
+  // Don't warn about implicitly non-Sendable types
+  takeSendable { print(c1) }
+  takeSendable { print(fn) }
+
+  // Warn about explicitly non-Sendable types
+  takeSendable { print(c2) } // expected-warning{{capture of 'c2' with non-sendable type 'C2' in a `@Sendable` closure}}
+  takeSendable { print(c3) } // expected-warning{{capture of 'c3' with non-sendable type 'C3' in a `@Sendable` closure}}
+
+  // Don't warn about explicitly Sendable type, even when it's wrong.
+  takeSendable { print(s1) }
+
+  // Don't warn when we wrapped an implicitly non-Sendable type in a struct.
+  takeSendable { print(s2) }
+
+  // FIXME: Ideally, we would warn about cases where a type in this module is
+  // inferred to be non-Sendable based on something explicitly non-Sendable,
+  // like in the case below.
+  takeSendable { print(s3) }
+}