Merge pull request swiftlang#37072 from DougGregor/user-initiated-async

[Concurrency] Perform userInitiated adjustment after determining priority

Author: DougGregor

stdlib/public/Concurrency/Actor.cpp

@@ -264,12 +264,12 @@ static bool isExecutingOnMainThread() {
 }
 
 JobPriority swift::swift_task_getCurrentThreadPriority() {
-  if (isExecutingOnMainThread())
-    return JobPriority::UserInitiated;
-
 #if defined(__APPLE__)
   return static_cast<JobPriority>(qos_class_self());
 #else
+  if (isExecutingOnMainThread())
+    return JobPriority::UserInitiated;
+
   return JobPriority::Unspecified;
 #endif
 }

stdlib/public/Concurrency/Task.swift

@@ -493,6 +493,10 @@ public func async(
     actualPriority = priority
   }
 
+  let adjustedPriority = actualPriority == .userInteractive
+    ? .userInitiated
+    : actualPriority
+
   // Set up the job flags for a new task.
   var flags = Task.JobFlags()
   flags.kind = .task