Merge pull request #70553 from hborla/bridge-to-sendable

Author: hborla

lib/SILGen/SILGenBridging.cpp

@@ -1131,7 +1131,7 @@ static ManagedValue emitCBridgedToNativeValue(
   }
 
   // id-to-Any bridging.
-  if (nativeType->isAny()) {
+  if (nativeType->isMarkerExistential()) {
     // If this is not a call result, use the normal erasure logic.
     if (!isCallResult) {
       return SGF.emitTransformedValue(loc, unwrapBridgedOptionals(v),
@@ -1163,10 +1163,18 @@ static ManagedValue emitCBridgedToNativeValue(
     auto optionalBridgedTy = SILType::getOptionalType(loweredBridgedTy);
     auto optionalMV = SGF.B.createUncheckedBitCast(
         loc, unwrapBridgedOptionals(v), optionalBridgedTy);
-    return SGF.emitApplyOfLibraryIntrinsic(loc,
+    v = SGF.emitApplyOfLibraryIntrinsic(loc,
                            SGF.getASTContext().getBridgeAnyObjectToAny(),
                            SubstitutionMap(), optionalMV, C)
               .getAsSingleValue(SGF, loc);
+    
+    // Convert to the marker existential if necessary.
+    auto anyType = SGF.getASTContext().getAnyExistentialType();
+    if (nativeType != anyType) {
+      v = SGF.emitTransformedValue(loc, v, anyType, nativeType);
+    }
+
+    return v;
   }
 
   // Bridge NSError to Error.

test/SILGen/Inputs/objc_bridging_sendable.h

@@ -2,4 +2,5 @@
 
 @interface NSBlah: NSObject
 - (void) takeSendable: (id __attribute__((swift_attr("@Sendable")))) x;
+@property (readonly) id __attribute__((swift_attr("@Sendable"))) x;
 @end

test/SILGen/objc_bridging_sendable.swift

@@ -8,4 +8,8 @@
 // CHECK: return
 public func passSendableToObjC(_ s: Sendable) {
   NSBlah().takeSendable(s)
-}
+}
+
+public func useSendableProperty(_ ns: NSBlah) {
+  _ = ns.x
+}