Merge remote-tracking branch 'origin/main' into rebranch

Author: swift-ci

include/swift/Runtime/HeapObject.h

@@ -1159,8 +1159,7 @@ swift_getMangledTypeName(const Metadata *type);
 #define STANDARD_OBJC_METHOD_IMPLS_FOR_SWIFT_OBJECTS \
 - (id)retain { \
   auto SELF = reinterpret_cast<HeapObject *>(self); \
-  swift_retain(SELF); \
-  return self; \
+  return reinterpret_cast<id>(swift_retain(SELF)); \
 } \
 - (oneway void)release { \
   auto SELF = reinterpret_cast<HeapObject *>(self); \