Merge pull request #69540 from xedin/rdar-102728938-5.10

[5.10][AST/TypeChecker] Allow existential values of Sendable be used from Objective-C

Author: xedin

include/swift/AST/DiagnosticsSema.def

@@ -5906,8 +5906,9 @@ ERROR(invalid_objc_decl_context,none,
       "@objc can only be used with members of classes, @objc protocols, and "
       "concrete extensions of classes", ())
 ERROR(invalid_objc_decl,none,
-      "only classes (and their extensions), protocols, methods, initializers, "
-      "properties, and subscript declarations can be declared @objc", ())
+      "only classes (and their extensions), non-marker protocols, methods, "
+      "initializers, properties, and subscript declarations can be declared"
+      " @objc", ())
 ERROR(invalid_objc_swift_rooted_class,none,
       "only classes that inherit from NSObject can be declared @objc", ())
 NOTE(invalid_objc_swift_root_class_insert_nsobject,none,

include/swift/AST/ExistentialLayout.h

@@ -105,6 +105,10 @@ struct ExistentialLayout {
   /// Zero or more primary associated type requirements from a
   /// ParameterizedProtocolType
   ArrayRef<Type> sameTypeRequirements;
+
+  /// Existentials allow a relaxed notion of \c ValueDecl::isObjC
+  /// that includes `Sendable` protocol.
+  static bool isObjCProtocol(ProtocolDecl *P);
 };
 
 }

lib/AST/Type.cpp

@@ -299,7 +299,7 @@ ExistentialLayout::ExistentialLayout(CanProtocolType type) {
   auto *protoDecl = type->getDecl();
 
   hasExplicitAnyObject = false;
-  containsNonObjCProtocol = !protoDecl->isObjC();
+  containsNonObjCProtocol = !isObjCProtocol(protoDecl);
   containsParameterized = false;
 
   protocols.push_back(protoDecl);
@@ -327,9 +327,7 @@ ExistentialLayout::ExistentialLayout(CanProtocolCompositionType type) {
       protoDecl = parameterized->getProtocol();
       containsParameterized = true;
     }
-    containsNonObjCProtocol |=
-        !protoDecl->isObjC() &&
-        !protoDecl->isSpecificProtocol(KnownProtocolKind::Sendable);
+    containsNonObjCProtocol |= !isObjCProtocol(protoDecl);
     protocols.push_back(protoDecl);
   }
 }
@@ -340,6 +338,10 @@ ExistentialLayout::ExistentialLayout(CanParameterizedProtocolType type)
   containsParameterized = true;
 }
 
+bool ExistentialLayout::isObjCProtocol(ProtocolDecl *P) {
+  return P->isObjC() || P->isSpecificProtocol(KnownProtocolKind::Sendable);
+}
+
 ExistentialLayout TypeBase::getExistentialLayout() {
   return getCanonicalType().getExistentialLayout();
 }

lib/PrintAsClang/ModuleContentsWriter.cpp

@@ -326,7 +326,8 @@ class ModuleWriter {
         (void)addImport(CD);
       }
     } else if (auto PD = dyn_cast<ProtocolDecl>(TD)) {
-      forwardDeclare(PD);
+      if (!PD->isMarkerProtocol())
+        forwardDeclare(PD);
     } else if (auto TAD = dyn_cast<TypeAliasDecl>(TD)) {
       bool imported = false;
       if (TAD->hasClangNode())

lib/Sema/TypeCheckAttr.cpp

@@ -1303,9 +1303,12 @@ void AttributeChecker::visitObjCAttr(ObjCAttr *attr) {
 
   // Only certain decls can be ObjC.
   llvm::Optional<Diag<>> error;
-  if (isa<ClassDecl>(D) ||
-      isa<ProtocolDecl>(D)) {
+  if (isa<ClassDecl>(D)) {
     /* ok */
+  } else if (auto *P = dyn_cast<ProtocolDecl>(D)) {
+    if (P->isMarkerProtocol())
+      error = diag::invalid_objc_decl;
+    /* ok on non-marker protocols */
   } else if (auto Ext = dyn_cast<ExtensionDecl>(D)) {
     if (!Ext->getSelfClassDecl())
       error = diag::objc_extension_not_class;

test/Concurrency/emit_objc_header_with_Sendable.swift

@@ -0,0 +1,29 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck %s -parse-as-library -emit-objc-header-path %t/swift.h
+// RUN: %FileCheck %s < %t/swift.h
+
+// REQUIRES: concurrency
+// REQUIRES: asserts
+// REQUIRES: objc_interop
+
+import Foundation
+
+@objc public protocol P {}
+
+@objc public class Klass : NSObject {
+  // CHECK: - (void)test1:(NSDictionary<NSString *, id> * _Nonnull)_;
+  @objc public func test1(_: [String: any Sendable]) {}
+  // CHECK: - (void)test2:(NSDictionary<NSString *, id <P>> * _Nonnull)_;
+  @objc public func test2(_: [String: any P & Sendable]) {}
+}
+
+@objc public protocol Q {
+  // CHECK: - (NSArray<NSDictionary<NSString *, id> *> * _Nonnull)data1 SWIFT_WARN_UNUSED_RESULT;
+  func data1() -> [[String: any Sendable]]
+  // CHECK: - (NSArray<id> * _Nullable)data2 SWIFT_WARN_UNUSED_RESULT;
+  func data2() -> [any Sendable]?
+  // CHECK: - (void)data3:(id _Nonnull)_;
+  func data3(_: any Sendable)
+  // CHECK: - (void)data4:(id _Nullable)_;
+  func data4(_: (any Sendable)?)
+}

test/attr/attr_marker_protocol.swift

@@ -67,3 +67,6 @@ protocol P10 { }
 
 extension Array: P10 where Element: P10, Element: P8 { }
 // expected-error@-1{{conditional conformance to non-marker protocol 'P10' cannot depend on conformance of 'Element' to marker protocol 'P8'}}
+
+@objc @_marker protocol P11 {}
+// expected-error@-1 {{only classes (and their extensions), non-marker protocols, methods, initializers, properties, and subscript declarations can be declared @objc}}