Rename flagAsEnqueuedOnExecutor to flagAsAndEnqueueOnExecutor to reflect

what it actually does.

Radar-Id: rdar://problem/88600541

Author: rokhinip

include/swift/ABI/Task.h

@@ -317,8 +317,9 @@ class AsyncTask : public Job {
   /// Flag that this task is now suspended.
   void flagAsSuspended();
 
-  /// Flag that the task is to be enqueued on the provided executor
-  void flagAsEnqueuedOnExecutor(ExecutorRef newExecutor);
+  /// Flag that the task is to be enqueued on the provided executor and actually
+  /// enqueue it
+  void flagAsAndEnqueueOnExecutor(ExecutorRef newExecutor);
 
   /// Flag that this task is now completed. This normally does not do anything
   /// but can be used to locally insert logging.

stdlib/public/Concurrency/Actor.cpp

@@ -1618,7 +1618,7 @@ static void swift_task_switchImpl(SWIFT_ASYNC_CONTEXT AsyncContext *resumeContex
   SWIFT_TASK_DEBUG_LOG("switch failed, task %p enqueued on executor %p", task,
                        newExecutor.getIdentity());
 
-  task->flagAsEnqueuedOnExecutor(newExecutor);
+  task->flagAsAndEnqueueOnExecutor(newExecutor);
   _swift_task_clearCurrent();
 }
 

stdlib/public/Concurrency/Task.cpp

@@ -234,7 +234,7 @@ void AsyncTask::completeFuture(AsyncContext *context) {
 
     // Enqueue the waiter on the global executor.
     // TODO: allow waiters to fill in a suggested executor
-    waitingTask->flagAsEnqueuedOnExecutor(ExecutorRef::generic());
+    waitingTask->flagAsAndEnqueueOnExecutor(ExecutorRef::generic());
 
     // Move to the next task.
     waitingTask = nextWaitingTask;
@@ -847,7 +847,7 @@ static AsyncTaskAndContext swift_task_create_commonImpl(
   // If we're supposed to enqueue the task, do so now.
   if (taskCreateFlags.enqueueJob()) {
     swift_retain(task);
-    task->flagAsEnqueuedOnExecutor(executor);
+    task->flagAsAndEnqueueOnExecutor(executor);
   }
 
   return {task, initialContext};
@@ -1020,7 +1020,7 @@ SWIFT_CC(swift)
 static void
 swift_task_enqueueTaskOnExecutorImpl(AsyncTask *task, ExecutorRef executor)
 {
-  task->flagAsEnqueuedOnExecutor(executor);
+  task->flagAsAndEnqueueOnExecutor(executor);
 }
 
 SWIFT_CC(swift)
@@ -1151,7 +1151,7 @@ static void resumeTaskAfterContinuation(AsyncTask *task,
   // to make a stronger best-effort attempt to catch racing attempts to
   // resume the continuation?
 
-  task->flagAsEnqueuedOnExecutor(context->ResumeToExecutor);
+  task->flagAsAndEnqueueOnExecutor(context->ResumeToExecutor);
 }
 
 SWIFT_CC(swift)

stdlib/public/Concurrency/TaskGroup.cpp

@@ -622,7 +622,7 @@ void TaskGroupImpl::offer(AsyncTask *completedTask, AsyncContext *context) {
         _swift_tsan_acquire(static_cast<Job *>(waitingTask));
 
         // TODO: allow the caller to suggest an executor
-        waitingTask->flagAsEnqueuedOnExecutor(ExecutorRef::generic());
+        waitingTask->flagAsAndEnqueueOnExecutor(ExecutorRef::generic());
         return;
       } // else, try again
     }

stdlib/public/Concurrency/TaskPrivate.h

@@ -697,9 +697,9 @@ retry:;
 /// original enqueueing thread.
 ///
 /// rdar://88366470 (Direct handoff behaviour when tasks switch executors)
-inline void AsyncTask::flagAsEnqueuedOnExecutor(ExecutorRef newExecutor) {
+inline void AsyncTask::flagAsAndEnqueueOnExecutor(ExecutorRef newExecutor) {
 
-  SWIFT_TASK_DEBUG_LOG("%p->flagAsEnqueuedOnExecutor()", this);
+  SWIFT_TASK_DEBUG_LOG("%p->flagAsAndEnqueueOnExecutor()", this);
   auto oldStatus = _private()._status().load(std::memory_order_relaxed);
   auto newStatus = oldStatus;