fix adding pending count in gyb

Author: ktoso

stdlib/public/Concurrency/Task.cpp

@@ -739,10 +739,8 @@ swift_task_create_commonImpl(size_t rawTaskCreateFlags,
     case TaskOptionRecordKind::InitialTaskExecutorUnowned:
       taskExecutor = cast<InitialTaskExecutorRefPreferenceTaskOptionRecord>(option)
                          ->getExecutorRef();
-      if (taskExecutor.isDefined()) {
-        jobFlags.task_setHasInitialTaskExecutorPreference(true);
-        taskExecutorIsOwned = false;
-      }
+      taskExecutorIsOwned = false;
+      jobFlags.task_setHasInitialTaskExecutorPreference(true);
       break;
 
     case TaskOptionRecordKind::InitialTaskExecutorOwned:
@@ -751,10 +749,8 @@ swift_task_create_commonImpl(size_t rawTaskCreateFlags,
       #else
       taskExecutor = cast<InitialTaskExecutorOwnedPreferenceTaskOptionRecord>(option)
                          ->getExecutorRefFromUnownedTaskExecutor();
-      if (taskExecutor.isDefined()) {
-        taskExecutorIsOwned = true;
-        jobFlags.task_setHasInitialTaskExecutorPreference(true);
-      }
+      taskExecutorIsOwned = true;
+      jobFlags.task_setHasInitialTaskExecutorPreference(true);
       #endif
       break;
 
@@ -1136,7 +1132,6 @@ swift_task_create_commonImpl(size_t rawTaskCreateFlags,
     task->_private().Local.initializeLinkParent(task, parent);
   }
 
-  // FIXME: add discarding flag
   concurrency::trace::task_create(
       task, parent, group, asyncLet,
       static_cast<uint8_t>(task->Flags.getPriority()),

stdlib/public/Concurrency/TaskGroup+addTask.swift.gyb

@@ -12,16 +12,6 @@
 
 import Swift
 
-// In the task-to-thread model we don't enqueue tasks created using addTask
-// to the global pool, but will run them inline instead.
-#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-@usableFromInline
-let __addTaskMustEnqueueJobOnCreate = false
-#else
-@usableFromInline
-let __addTaskMustEnqueueJobOnCreate = true
-#endif
-
 // ==== addTask / addTaskUnlessCancelled ---------------------------------------
 % # Generate:
 % # - both method kinds (2)
@@ -137,6 +127,7 @@ let __addTaskMustEnqueueJobOnCreate = true
 %
 % IS_ADD_UNLESS_CANCELLED = METHOD_NAME == "addTaskUnlessCancelled"
 % IS_IMPL_UNAVAILABLE = any('Unavailable in task-to-thread' in av for av in ALL_AVAILABILITY)
+% IS_TASK_TO_THREAD_MODEL = 'SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY' == IFDEF
 %
 % HAS_TASK_PRIORITY = any('priority:' in param for param in PARAMS)
 % HAS_TASK_NAME = any('name:' in param for param in PARAMS)
@@ -205,8 +196,14 @@ extension ${TYPE} {
       isChildTask: true,
       copyTaskLocals: false,
       inheritContext: false,
-      enqueueJob: true,
-      addPendingGroupTaskUnconditionally: ${str(not IS_ADD_UNLESS_CANCELLED).lower()}, // FIXME: just always true?
+      enqueueJob: ${'false' if IS_TASK_TO_THREAD_MODEL else 'true'},
+      % if IS_ADD_UNLESS_CANCELLED:
+      % # In this case, we already added the pending task count before we create the task
+      % # so we must not add to the pending counter again.
+      addPendingGroupTaskUnconditionally: false,
+      % else:
+      addPendingGroupTaskUnconditionally: true,
+      % end
       isDiscardingTask: ${str(IS_DISCARDING).lower()}
     )
 

stdlib/public/Concurrency/TaskPrivate.h

@@ -796,14 +796,12 @@ struct AsyncTask::PrivateStorage {
     // here, before the task-local storage elements are destroyed; in order to
     // respect stack-discipline of the task-local allocator.
     {
-
-      if (task->hasInitialTaskExecutorPreferenceRecord()) {
-        task->dropInitialTaskExecutorPreferenceRecord();
-      }
-
       if (task->hasInitialTaskNameRecord()) {
         task->dropInitialTaskNameRecord();
       }
+      if (task->hasInitialTaskExecutorPreferenceRecord()) {
+        task->dropInitialTaskExecutorPreferenceRecord();
+      }
     }
 
     // Drain unlock the task and remove any overrides on thread as a

test/Concurrency/async_main.swift

@@ -71,11 +71,12 @@ func asyncFunc() async {
 // CHECK-SIL-NEXT:  [[GROUP:%.*]] = enum $Optional<Builtin.RawPointer>, #Optional.none
 // CHECK-SIL-NEXT:  [[TASK_EXECUTOR_UNOWNED:%.*]] = enum $Optional<Builtin.Executor>, #Optional.none
 // CHECK-SIL-NEXT:  [[TASK_EXECUTOR_OWNED:%.*]] = enum $Optional<any TaskExecutor>, #Optional.none
+// CHECK-SIL-NEXT:  [[TASK_NAME:%.*]] = enum $Optional<Builtin.RawPointer>, #Optional.none
 // CHECK-SIL-NEXT:  // function_ref thunk for @escaping @convention(thin) @async () -> ()
 // CHECK-SIL-NEXT:  [[THUNK_FN:%.*]] = function_ref @$sIetH_yts5Error_pIegHrzo_TR : $@convention(thin) @async (@convention(thin) @async () -> ()) -> (@out (), @error any Error)
 // CHECK-SIL-NEXT:  [[THUNK:%.*]] = partial_apply [callee_guaranteed] [[THUNK_FN]]([[ASYNC_MAIN_FN]]) : $@convention(thin) @async (@convention(thin) @async () -> ()) -> (@out (), @error any Error)
 // CHECK-SIL-NEXT:  [[CONVERTED_THUNK:%.*]] = convert_function [[THUNK]] : $@async @callee_guaranteed () -> (@out (), @error any Error) to $@async @callee_guaranteed @substituted <τ_0_0> () -> (@out τ_0_0, @error any Error) for <()>
-// CHECK-SIL-NEXT:  [[TASK_RESULT:%.*]] = builtin "createAsyncTask"<()>([[FLAGS]] : $Int, [[OPT_SERIAL_EXECUTOR]] : $Optional<Builtin.Executor>, [[GROUP]] : $Optional<Builtin.RawPointer>, [[TASK_EXECUTOR_UNOWNED]] : $Optional<Builtin.Executor>, [[TASK_EXECUTOR_OWNED]] : $Optional<any TaskExecutor>, [[CONVERTED_THUNK]] : $@async @callee_guaranteed @substituted <τ_0_0> () -> (@out τ_0_0, @error any Error) for <()>) : $(Builtin.NativeObject, Builtin.RawPointer)
+// CHECK-SIL-NEXT:  [[TASK_RESULT:%.*]] = builtin "createAsyncTask"<()>([[FLAGS]] : $Int, [[OPT_SERIAL_EXECUTOR]] : $Optional<Builtin.Executor>, [[GROUP]] : $Optional<Builtin.RawPointer>, [[TASK_EXECUTOR_UNOWNED]] : $Optional<Builtin.Executor>, [[TASK_EXECUTOR_OWNED]] : $Optional<any TaskExecutor>, [[TASK_NAME]] : $Optional<Builtin.RawPointer>, [[CONVERTED_THUNK]] : $@async @callee_guaranteed @substituted <τ_0_0> () -> (@out τ_0_0, @error any Error) for <()>) : $(Builtin.NativeObject, Builtin.RawPointer)
 // CHECK-SIL-NEXT:  [[TASK:%.*]] = tuple_extract [[TASK_RESULT]] : $(Builtin.NativeObject, Builtin.RawPointer), 0
 // CHECK-SIL-NEXT:  // function_ref swift_job_run
 // CHECK-SIL-NEXT:  [[RUN_FN:%.*]] = function_ref @swift_job_run : $@convention(thin) (UnownedJob, UnownedSerialExecutor) -> ()