Merge pull request #62317 from mikeash/fix-custom-rr

[Runtime] Add missing bridgeObjectRR_xN entrypoints.

Author: swift-ci

include/swift/Runtime/CustomRRABI.h

@@ -62,7 +62,7 @@ Param returnTypeHelper(Ret (*)(Param)) {}
 // Helper macro that defines one entrypoint that takes the parameter in reg and
 // calls through to function.
 #define CUSTOM_RR_ENTRYPOINTS_DEFINE_ONE_ENTRYPOINT(reg, function)             \
-  extern "C" SWIFT_RUNTIME_EXPORT decltype(function(                           \
+  SWIFT_RUNTIME_EXPORT decltype(function(                                      \
       nullptr)) function##_x##reg() {                                          \
     decltype(returnTypeHelper(function)) ptr;                                  \
     asm(".ifnc %0, x" #reg "\n"                                                \

stdlib/public/runtime/SwiftObject.mm

@@ -26,6 +26,7 @@
 #include "llvm/ADT/StringRef.h"
 #include "swift/Basic/Lazy.h"
 #include "swift/Runtime/Casting.h"
+#include "swift/Runtime/CustomRRABI.h"
 #include "swift/Runtime/Debug.h"
 #include "swift/Runtime/EnvironmentVariables.h"
 #include "swift/Runtime/Heap.h"
@@ -616,6 +617,8 @@ static bool isBridgeObjectTaggedPointer(void *object) {
 #endif
 }
 
+CUSTOM_RR_ENTRYPOINTS_DEFINE_ENTRYPOINTS(swift_bridgeObjectRetain)
+
 SWIFT_RUNTIME_EXPORT
 void *swift::swift_nonatomic_bridgeObjectRetain(void *object) {
 #if SWIFT_OBJC_INTEROP
@@ -656,6 +659,8 @@ static bool isBridgeObjectTaggedPointer(void *object) {
 #endif
 }
 
+CUSTOM_RR_ENTRYPOINTS_DEFINE_ENTRYPOINTS(swift_bridgeObjectRelease)
+
 void swift::swift_nonatomic_bridgeObjectRelease(void *object) {
 #if SWIFT_OBJC_INTEROP
   if (isObjCTaggedPointer(object) || isBridgeObjectTaggedPointer(object))

test/Runtime/custom_rr_abi.swift

@@ -6,8 +6,6 @@
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
-// REQUIRES: rdar102783074
-
 import StdlibUnittest
 
 // A class that can provider a retainable pointer and determine whether it's