Merge pull request #81900 from ktoso/pick-wip-fix-for-real-ptr-auth

Author: ktoso

include/swift/ABI/MetadataValues.h

@@ -1745,7 +1745,7 @@ namespace SpecialPointerAuthDiscriminators {
   const uint16_t AsyncContextParent = 0xbda2; // = 48546
   const uint16_t AsyncContextResume = 0xd707; // = 55047
   const uint16_t AsyncContextYield = 0xe207; // = 57863
-  const uint16_t CancellationNotificationFunction = 0xf73; // = 3955 (TaskPriority, TaskPriority) -> Void
+  const uint16_t CancellationNotificationFunction = 0x0f08; // = 3848
   const uint16_t EscalationNotificationFunction = 0x7861; // = 30817
   const uint16_t AsyncThinNullaryFunction = 0x0f08; // = 3848
   const uint16_t AsyncFutureFunction = 0x720f; // = 29199

include/swift/ABI/TaskStatus.h

@@ -269,7 +269,7 @@ class CancellationNotificationStatusRecord : public TaskStatusRecord {
 /// subsequently used.
 class EscalationNotificationStatusRecord : public TaskStatusRecord {
 public:
-  using FunctionType = SWIFT_CC(swift) void(JobPriority, JobPriority, SWIFT_CONTEXT void *);
+  using FunctionType = SWIFT_CC(swift) void(uint8_t, uint8_t, SWIFT_CONTEXT void *);
 
 private:
   FunctionType *__ptrauth_swift_escalation_notification_function Function;
@@ -282,7 +282,10 @@ class EscalationNotificationStatusRecord : public TaskStatusRecord {
   }
 
   void run(JobPriority oldPriority, JobPriority newPriority) {
-    Function(oldPriority, newPriority, Argument);
+    Function(
+      static_cast<size_t>(oldPriority),
+      static_cast<size_t>(newPriority),
+      Argument);
   }
 
   static bool classof(const TaskStatusRecord *record) {

stdlib/public/Concurrency/Task.cpp

@@ -1763,7 +1763,8 @@ swift_task_addCancellationHandlerImpl(
     void *context) {
   void *allocation =
       swift_task_alloc(sizeof(CancellationNotificationStatusRecord));
-  auto unsigned_handler = swift_auth_code(handler, 3848);
+  auto unsigned_handler = swift_auth_code_function(handler,
+      SpecialPointerAuthDiscriminators::CancellationNotificationFunction);
   auto *record = ::new (allocation)
       CancellationNotificationStatusRecord(unsigned_handler, context);
 
@@ -1816,7 +1817,8 @@ swift_task_addPriorityEscalationHandlerImpl(
     void *context) {
   void *allocation =
       swift_task_alloc(sizeof(EscalationNotificationStatusRecord));
-  auto unsigned_handler = swift_auth_code(handler, 3955);
+  auto unsigned_handler = swift_auth_code_function(handler,
+      SpecialPointerAuthDiscriminators::EscalationNotificationFunction);
   auto *record = ::new (allocation)
       EscalationNotificationStatusRecord(unsigned_handler, context);
 

test/Concurrency/async_task_escalate_priority.swift

@@ -19,9 +19,6 @@
 // UNSUPPORTED: DARWIN_SIMULATOR=ios
 // UNSUPPORTED: DARWIN_SIMULATOR=tvos
 
-// rdar://107390341 - Because task escalation tests seem disabled on this platform
-// UNSUPPORTED: CPU=arm64e
-
 import Darwin
 @preconcurrency import Dispatch