cleanup

Author: ktoso

stdlib/public/BackDeployConcurrency/Actor.cpp

@@ -285,9 +285,6 @@ JobPriority swift::swift_task_getCurrentThreadPriority() {
 SWIFT_CC(swift)
 static bool swift_task_isCurrentExecutorImpl(ExecutorRef executor) {
   if (auto currentTracking = ExecutorTrackingInfo::current()) {
-            currentTracking->getActiveExecutor().getIdentity(),
-            currentTracking->getActiveExecutor().isMainExecutor() ? "y" : "n",
-            currentTracking->getActiveExecutor().isDefaultActor() ? "y" : "n");
     return currentTracking->getActiveExecutor() == executor;
   }
 

stdlib/public/Concurrency/Actor.cpp

@@ -301,7 +301,7 @@ static bool swift_task_isCurrentExecutorImpl(ExecutorRef executor) {
     return currentTracking->getActiveExecutor() == executor;
   }
 
-  // TODO(ktoso): checking the "is main thread" is not correct, main executor can be not main thread
+  // TODO(ktoso): checking the "is main thread" is not correct, main executor can be not main thread, relates to rdar://106188692
   return executor.isMainExecutor() && isExecutingOnMainThread();
 }
 

stdlib/public/Concurrency/CMakeLists.txt

@@ -107,7 +107,7 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
   UncheckedContinuation.swift
   GlobalActor.swift
   MainActor.swift
-  Job.swift
+  PartialAsyncTask.swift
   SourceCompatibilityShims.swift
   Task.cpp
   Task.swift

stdlib/public/Concurrency/PartialAsyncTask.swift

@@ -56,8 +56,30 @@ public struct UnownedJob: Sendable {
   public func _runSynchronously(on executor: UnownedSerialExecutor) {
       _swiftJobRun(self, executor)
   }
+
+  @_alwaysEmitIntoClient
+  @inlinable
+  public func runSynchronously(on executor: UnownedSerialExecutor) {
+      _swiftJobRun(self, executor)
+  }
+
 }
 
+@available(SwiftStdlib 5.9, *)
+extension UnownedJob: CustomStringConvertible {
+  @available(SwiftStdlib 5.9, *)
+  public var description: String {
+    let id = _getJobTaskId(self)
+    /// Tasks are always assigned an unique ID, however some jobs may not have it set,
+    /// and it appearing as 0 for _different_ jobs may lead to misunderstanding it as
+    /// being "the same 0 id job", we specifically print 0 (id not set) as nil.
+    if (id > 0) {
+      return "\(Self.self)(id: \(id))"
+    } else {
+      return "\(Self.self)(id: nil)"
+    }
+  }
+}
 
 /// A unit of scheduleable work.
 ///
@@ -79,8 +101,7 @@ public struct Job: Sendable {
   }
 
   public var priority: JobPriority {
-    // let raw = _swift_concurrency_jobPriority(UnownedJob(context: self.context)) // TODO: do we also surface this or the base priority?
-    let raw = _taskCurrentPriority(context as! Builtin.NativeObject)
+    let raw = _swift_concurrency_jobPriority(UnownedJob(context: self.context))
     return JobPriority(rawValue: raw)
   }
 

test/Concurrency/Runtime/custom_executors_assume_main_asyncmain.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift( -Xfrontend enable-experimental-move-only -Xfrontend -disable-availability-checking %import-libdispatch -parse-as-library) | %FileCheck %s
+// RUN: %target-run-simple-swift( -Xfrontend -enable-experimental-move-only -Xfrontend -disable-availability-checking %import-libdispatch -parse-as-library) | %FileCheck %s
 
 // REQUIRES: concurrency
 // REQUIRES: executable_test

test/Concurrency/Runtime/custom_executors_assume_main_asyncmain_crash.swift

@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift( -Xfrontend -enable-experimental-move-only -Xfrontend -disable-availability-checking %import-libdispatch -parse-as-library) | %FileCheck %s
+// RUN: %target-run-simple-swift( -Xfrontend -enable-experimental-move-only -Xfrontend -disable-availability-checking %import-libdispatch -parse-as-library) | %FileCheck %s --dump-input=always
 
 // REQUIRES: concurrency
 // REQUIRES: executable_test
@@ -41,9 +41,6 @@ actor Custom {
     await Task() {
       await actor.report()
     }.value
-    await Task(priority: .low) {
-      await actor.report()
-    }.value
     print("end")
   }
 }

test/Concurrency/Runtime/custom_executors_default.swift

@@ -24,30 +24,6 @@ extension WithSpecifiedExecutor {
   }
 }
 
-final class InlineExecutor: SpecifiedExecutor, CustomStringConvertible {
-  let name: String
-
-  init(_ name: String) {
-    self.name = name
-  }
-
-  public func enqueue(_ job: UnownedJob) {
-    print("\(self): enqueue")
-    job.runSynchronously(on: self.asUnownedSerialExecutor())
-    print("\(self): after run")
-  }
-
-  public func enqueue(_ job: __owned Job) {
-    print("\(self): enqueue")
-    job.runSynchronously(on: self)
-    print("\(self): after run")
-  }
-
-  var description: Swift.String {
-    "InlineExecutor(\(name))"
-  }
-}
-
 final class NaiveQueueExecutor: SpecifiedExecutor, CustomStringConvertible {
   let queue: DispatchQueue
 
@@ -58,7 +34,7 @@ final class NaiveQueueExecutor: SpecifiedExecutor, CustomStringConvertible {
   public func enqueue(_ job: UnownedJob) {
     print("\(self): enqueue")
     queue.sync {
-      job.runSynchronously(on: self)
+      job.runSynchronously(on: self.asUnownedSerialExecutor())
     }
     print("\(self): after run")
   }
@@ -67,7 +43,7 @@ final class NaiveQueueExecutor: SpecifiedExecutor, CustomStringConvertible {
     print("\(self): enqueue")
     let unowned = UnownedJob(job)
     queue.sync {
-      unowned.runSynchronously(on: self)
+      unowned.runSynchronously(on: self.asUnownedSerialExecutor())
     }
     print("\(self): after run")
   }
@@ -89,7 +65,7 @@ actor MyActor: WithSpecifiedExecutor {
   }
 
   func test(expectedExecutor: some SerialExecutor, expectedQueue: DispatchQueue) {
-    precondition(_taskIsOnExecutor(expectedExecutor), "Expected to be on: \(expectedExecutor)")
+    // FIXME(waiting on preconditions to merge): preconditionTaskOnExecutor(expectedExecutor, "Expected to be on: \(expectedExecutor)")
     dispatchPrecondition(condition: .onQueue(expectedQueue))
     print("\(Self.self): on executor \(expectedExecutor)")
   }
@@ -109,9 +85,9 @@ actor MyActor: WithSpecifiedExecutor {
 }
 
 // CHECK:      begin
-// CHECK-NEXT: InlineExecutor(one): enqueue
-// CHECK-NEXT: MyActor: on executor InlineExecutor(one)
-// CHECK-NEXT: MyActor: on executor InlineExecutor(one)
-// CHECK-NEXT: MyActor: on executor InlineExecutor(one)
-// CHECK-NEXT: InlineExecutor(one): after run
+// CHECK-NEXT: NaiveQueueExecutor(<OS_dispatch_queue_serial: CustomQueue>): enqueue
+// CHECK-NEXT: MyActor: on executor NaiveQueueExecutor(<OS_dispatch_queue_serial: CustomQueue>)
+// CHECK-NEXT: MyActor: on executor NaiveQueueExecutor(<OS_dispatch_queue_serial: CustomQueue>)
+// CHECK-NEXT: MyActor: on executor NaiveQueueExecutor(<OS_dispatch_queue_serial: CustomQueue>)
+// CHECK-NEXT: NaiveQueueExecutor(<OS_dispatch_queue_serial: CustomQueue>): after run
 // CHECK-NEXT: end