[Concurrency] minor renames of new API for adding escalation handlers

Author: ktoso

include/swift/Runtime/Concurrency.h

@@ -609,16 +609,16 @@ SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 void swift_task_removeCancellationHandler(
     CancellationNotificationStatusRecord *record);
 
-/// Create and add an escalation record to the task.
+/// Create and add an priority escalation record to the task.
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 EscalationNotificationStatusRecord*
-swift_task_addEscalationHandler(
+swift_task_addPriorityEscalationHandler(
     EscalationNotificationStatusRecord::FunctionType handler,
     void *handlerContext);
 
-/// Remove the passed cancellation record from the task.
+/// Remove the passed priority escalation record from the task.
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
-void swift_task_removeEscalationHandler(
+void swift_task_removePriorityEscalationHandler(
     EscalationNotificationStatusRecord *record);
 
 /// Create a NullaryContinuationJob from a continuation.

stdlib/public/CompatibilityOverride/CompatibilityOverrideConcurrency.def

@@ -206,14 +206,14 @@ OVERRIDE_TASK(task_removeCancellationHandler, void,
               SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift), swift::,
               (CancellationNotificationStatusRecord *record), (record))
 
-OVERRIDE_TASK(task_addEscalationHandler,
+OVERRIDE_TASK(task_addPriorityEscalationHandler,
               EscalationNotificationStatusRecord *,
               SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift), swift::,
               (EscalationNotificationStatusRecord::FunctionType handler,
                void *context),
               (handler, context))
 
-OVERRIDE_TASK(task_removeEscalationHandler, void,
+OVERRIDE_TASK(task_removePriorityEscalationHandler, void,
               SWIFT_EXPORT_FROM(swift_Concurrency), SWIFT_CC(swift), swift::,
               (EscalationNotificationStatusRecord *record), (record))
 

stdlib/public/Concurrency/Task.cpp

@@ -1768,7 +1768,7 @@ static void swift_task_removeCancellationHandlerImpl(
 
 SWIFT_CC(swift)
 static EscalationNotificationStatusRecord*
-swift_task_addEscalationHandlerImpl(
+swift_task_addPriorityEscalationHandlerImpl(
     EscalationNotificationStatusRecord::FunctionType handler,
     void *context) {
   void *allocation =
@@ -1785,7 +1785,7 @@ swift_task_addEscalationHandlerImpl(
 }
 
 SWIFT_CC(swift)
-static void swift_task_removeEscalationHandlerImpl(
+static void swift_task_removePriorityEscalationHandlerImpl(
     EscalationNotificationStatusRecord *record) {
   removeStatusRecordFromSelf(record);
   swift_task_dealloc(record);

stdlib/public/Concurrency/Task.swift

@@ -994,23 +994,23 @@ public func withTaskPriorityEscalationHandler<T, E>(
   let handler0: (UInt8) -> Void = {
     handler(TaskPriority(rawValue: $0))
   }
-  let record = _taskAddEscalationHandler(handler: handler0)
-  defer { _taskRemoveEscalationHandler(record: record) }
+  let record = _taskaddPriorityEscalationHandler(handler: handler0)
+  defer { _taskremovePriorityEscalationHandler(record: record) }
 
   return try await operation()
 }
 
 @usableFromInline
 @available(SwiftStdlib 9999, *)
-@_silgen_name("swift_task_addEscalationHandler")
-func _taskAddEscalationHandler(
+@_silgen_name("swift_task_addPriorityEscalationHandler")
+func _taskaddPriorityEscalationHandler(
   handler: (UInt8) -> Void
 ) -> UnsafeRawPointer /*EscalationNotificationStatusRecord*/
 
 @usableFromInline
 @available(SwiftStdlib 9999, *)
-@_silgen_name("swift_task_removeEscalationHandler")
-func _taskRemoveEscalationHandler(
+@_silgen_name("swift_task_removePriorityEscalationHandler")
+func _taskremovePriorityEscalationHandler(
   record: UnsafeRawPointer /*EscalationNotificationStatusRecord*/
 )
 

test/Concurrency/async_task_escalate_priority.swift

@@ -26,11 +26,6 @@ import Darwin
 @preconcurrency import Dispatch
 import StdlibUnittest
 
-func TESTTEST_taskAddCancellationHandler(handler: () -> Void) {
-  handler()
-}
-func TESTTEST_taskAddEscalationHandler(handler: (TaskPriority) -> Void, t: TaskPriority) { handler(t) }
-
 func loopUntil(priority: TaskPriority) async {
   var loops = 10
   var currentPriority = Task.currentPriority