rebase cleanup

Author: ktoso

lib/AST/Decl.cpp

@@ -5212,9 +5212,6 @@ NominalTypeDecl::getExecutorOwnedEnqueueFunction() const {
     if (!isa<ProtocolDecl>(candidate->getDeclContext()))
       continue;
 
-    fprintf(stderr, "[%s:%d](%s) candidate\n", __FILE_NAME__, __LINE__, __FUNCTION__);
-    candidate->dump();
-
     if (auto *funcDecl = dyn_cast<AbstractFunctionDecl>(candidate)) {
       if (funcDecl->getParameters()->size() != 1)
         continue;

stdlib/public/BackDeployConcurrency/Actor.cpp

@@ -285,14 +285,12 @@ JobPriority swift::swift_task_getCurrentThreadPriority() {
 SWIFT_CC(swift)
 static bool swift_task_isCurrentExecutorImpl(ExecutorRef executor) {
   if (auto currentTracking = ExecutorTrackingInfo::current()) {
-    fprintf(stderr, "[%s:%d](%s) current executor = %p, main:%s, default:%s\n", __FILE_NAME__, __LINE__, __FUNCTION__,
             currentTracking->getActiveExecutor().getIdentity(),
             currentTracking->getActiveExecutor().isMainExecutor() ? "y" : "n",
             currentTracking->getActiveExecutor().isDefaultActor() ? "y" : "n");
     return currentTracking->getActiveExecutor() == executor;
   }
 
-  fprintf(stderr, "[%s:%d](%s) no executor found in tracking\n", __FILE_NAME__, __LINE__, __FUNCTION__);
   return executor.isMainExecutor() && isExecutingOnMainThread();
 }
 

stdlib/public/BackDeployConcurrency/Executor.swift

@@ -74,7 +74,6 @@ public struct UnownedSerialExecutor: Sendable {
 @_silgen_name("_swift_task_enqueueOnExecutor")
 internal func _enqueueOnExecutor<E>(job: UnownedJob, executor: E)
 where E: SerialExecutor {
-  // TODO: something to do here?
   executor.enqueue(job)
 }
 

stdlib/public/Concurrency/Actor.cpp

@@ -297,14 +297,11 @@ JobPriority swift::swift_task_getCurrentThreadPriority() {
 
 SWIFT_CC(swift)
 static bool swift_task_isCurrentExecutorImpl(ExecutorRef executor) {
-  fprintf(stderr, "[%s:%d](%s)                    check executor:%p isMain:%d\n", __FILE_NAME__, __LINE__, __FUNCTION__, executor, executor.isMainExecutor() ? 1 : 0);
   if (auto currentTracking = ExecutorTrackingInfo::current()) {
-    fprintf(stderr, "[%s:%d](%s) current tracking, active executor:%p\n", __FILE_NAME__, __LINE__, __FUNCTION__, currentTracking->getActiveExecutor());
     return currentTracking->getActiveExecutor() == executor;
   }
 
-  fprintf(stderr, "[%s:%d](%s)    executor.isMainExecutor:%d\n", __FILE_NAME__, __LINE__, __FUNCTION__, executor.isMainExecutor() ? 1 : 0);
-  fprintf(stderr, "[%s:%d](%s) isExecutingOnMainThread():%d\n", __FILE_NAME__, __LINE__, __FUNCTION__, isExecutingOnMainThread() ? 1 : 0);
+  // TODO(ktoso): checking the "is main thread" is not correct, main executor can be not main thread
   return executor.isMainExecutor() && isExecutingOnMainThread();
 }
 

stdlib/public/Concurrency/AssumeActorExecutor.swift

@@ -79,7 +79,6 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
   ../CompatibilityOverride/CompatibilityOverride.cpp
   Actor.cpp
   Actor.swift
-  AssumeActorExecutor.swift
   AsyncLet.cpp
   AsyncLet.swift
   CheckedContinuation.swift

stdlib/public/Concurrency/CMakeLists.txt

@@ -13,6 +13,8 @@
 import Swift
 @_implementationOnly import _SwiftConcurrencyShims
 
+// TODO(swift): rename the file to Job.swift eventually, we don't use PartialTask terminology anymore
+
 @available(SwiftStdlib 5.1, *)
 @_silgen_name("swift_job_run")
 @usableFromInline

stdlib/public/Concurrency/Job.swift renamed to stdlib/public/Concurrency/PartialAsyncTask.swift

@@ -7,6 +7,9 @@
 // UNSUPPORTED: back_deployment_runtime
 // REQUIRES: concurrency_runtime
 
+// rdar://84054793 - distributed actors don't support custom executors yet
+// XFAIL: *
+
 import Distributed
 
 // Not really codable