Merge pull request #35772 from nate-chandler/concurrency/runtime/rdar72357371

[Runtime] Ptrauth for runAsyncAndBlock.

Author: nate-chandler

include/swift/ABI/MetadataValues.h

@@ -1179,6 +1179,7 @@ namespace SpecialPointerAuthDiscriminators {
   const uint16_t JobInvokeFunction = 0xcc64; // = 52324
   const uint16_t TaskResumeFunction = 0x2c42; // = 11330
   const uint16_t TaskResumeContext = 0x753a; // = 30010
+  const uint16_t AsyncRunAndBlockFunction = 0x0f08; // 3848
   const uint16_t AsyncContextParent = 0xbda2; // = 48546
   const uint16_t AsyncContextResume = 0xd707; // = 55047
   const uint16_t AsyncContextYield = 0xe207; // = 57863

include/swift/Runtime/Config.h

@@ -327,6 +327,17 @@ static inline T swift_auth_data_non_address(T value, unsigned extra) {
 #endif
 }
 
+template <typename T>
+SWIFT_RUNTIME_ATTRIBUTE_ALWAYS_INLINE static inline T
+swift_auth_code(T value, unsigned extra) {
+#if SWIFT_PTRAUTH
+  return (T)ptrauth_auth_function((void *)value,
+                                  ptrauth_key_process_independent_code, extra);
+#else
+  return value;
+#endif
+}
+
 #endif
 
 #endif // SWIFT_RUNTIME_CONFIG_H

stdlib/public/Concurrency/Task.cpp

@@ -430,14 +430,22 @@ static void runAndBlock_start(AsyncTask *task, ExecutorRef executor,
   if (functionContext) {
     function = reinterpret_cast<RunAndBlockSignature::FunctionType*>(
                    const_cast<void*>(callerContext->Function));
+    function = swift_auth_code(
+        function, SpecialPointerAuthDiscriminators::AsyncRunAndBlockFunction);
     calleeContextSize =
       static_cast<ThickAsyncFunctionContext*>(functionContext)
         ->ExpectedContextSize;
 
   // Otherwise, the function pointer is an async function pointer.
   } else {
-    auto fnPtr = reinterpret_cast<const RunAndBlockSignature::FunctionPointer*>(
-                   callerContext->Function);
+    auto fnPtr =
+        reinterpret_cast<const RunAndBlockSignature::FunctionPointer *>(
+            const_cast<void *>(callerContext->Function));
+#if SWIFT_PTRAUTH
+    fnPtr = (const RunAndBlockSignature::FunctionPointer *)ptrauth_auth_data(
+        (void *)fnPtr, ptrauth_key_process_independent_code,
+        SpecialPointerAuthDiscriminators::AsyncRunAndBlockFunction);
+#endif
     function = fnPtr->Function;
     calleeContextSize = fnPtr->ExpectedContextSize;
   }

test/Concurrency/Runtime/class_resilience.swift

@@ -10,8 +10,8 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
-
-// REQUIRES: OS=macosx
+// XFAIL: windows
+// XFAIL: linux
 
 import StdlibUnittest
 import resilient_class

test/Concurrency/Runtime/protocol_resilience.swift

@@ -10,8 +10,8 @@
 
 // REQUIRES: executable_test
 // REQUIRES: concurrency
-
-// REQUIRES: OS=macosx
+// XFAIL: windows
+// UNSUPPORTED: linux
 
 import StdlibUnittest
 import resilient_protocol