Merge pull request #16213 from aschwaighofer/fix_swift_bridgeObjectRetain

Runtime: Fix swift_bridgeObjectRetain family of functions to return the input object

Author: aschwaighofer

stdlib/public/runtime/MetadataImpl.h

@@ -410,8 +410,7 @@ struct BridgeObjectBox :
   static constexpr unsigned numExtraInhabitants = 1;
 
   static void *retain(void *obj) {
-    (void)swift_bridgeObjectRetain(obj);
-    return obj;
+    return swift_bridgeObjectRetain(obj);
   }
 
   static void release(void *obj) {

stdlib/public/runtime/SwiftObject.mm

@@ -603,12 +603,13 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {
 #if SWIFT_OBJC_INTEROP
   if (!isNonNative_unTagged_bridgeObject(object)) {
     swift_retain(static_cast<HeapObject *>(objectRef));
-    return static_cast<HeapObject *>(objectRef);
+    return object;
   }
-  return objc_retain(static_cast<id>(objectRef));
+  objc_retain(static_cast<id>(objectRef));
+  return object;
 #else
   swift_retain(static_cast<HeapObject *>(objectRef));
-  return static_cast<HeapObject *>(objectRef);
+  return object;
 #endif
 }
 
@@ -624,12 +625,13 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {
 #if SWIFT_OBJC_INTEROP
   if (!isNonNative_unTagged_bridgeObject(object)) {
     swift_nonatomic_retain(static_cast<HeapObject *>(objectRef));
-    return static_cast<HeapObject *>(objectRef);
+    return object;
   }
-  return objc_retain(static_cast<id>(objectRef));
+  objc_retain(static_cast<id>(objectRef));
+  return object;
 #else
   swift_nonatomic_retain(static_cast<HeapObject *>(objectRef));
-  return static_cast<HeapObject *>(objectRef);
+  return object;
 #endif
 }
 
@@ -680,14 +682,14 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {
   void *objc_ret = nullptr;
   if (!isNonNative_unTagged_bridgeObject(object)) {
     swift_retain_n(static_cast<HeapObject *>(objectRef), n);
-    return static_cast<HeapObject *>(objectRef);
+    return object;
   }
   for (int i = 0;i < n; ++i)
     objc_ret = objc_retain(static_cast<id>(objectRef));
-  return objc_ret;
+  return object;
 #else
   swift_retain_n(static_cast<HeapObject *>(objectRef), n);
-  return static_cast<HeapObject *>(objectRef);
+  return object;
 #endif
 }
 
@@ -721,14 +723,14 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {
   void *objc_ret = nullptr;
   if (!isNonNative_unTagged_bridgeObject(object)) {
     swift_nonatomic_retain_n(static_cast<HeapObject *>(objectRef), n);
-    return static_cast<HeapObject *>(objectRef);
+    return object;
   }
   for (int i = 0;i < n; ++i)
     objc_ret = objc_retain(static_cast<id>(objectRef));
-  return objc_ret;
+  return object;
 #else
   swift_nonatomic_retain_n(static_cast<HeapObject *>(objectRef), n);
-  return static_cast<HeapObject *>(objectRef);
+  return object;
 #endif
 }