[Concurrency] move isAsyncTask into flags of task creation

Author: ktoso

include/swift/ABI/MetadataValues.h

@@ -2036,10 +2036,11 @@ class JobFlags : public FlagSet<uint32_t> {
 
     // Kind-specific flags.
 
-    Task_IsChildTask      = 24,
-    Task_IsFuture         = 25,
-    Task_IsGroupChildTask = 26,
-    Task_IsContinuingAsyncTask      = 27,
+    Task_IsChildTask           = 24,
+    Task_IsFuture              = 25,
+    Task_IsGroupChildTask      = 26,
+    Task_IsContinuingAsyncTask = 27,
+    Task_IsAsyncLetTask        = 28,
   };
 
   explicit JobFlags(uint32_t bits) : FlagSet(bits) {}
@@ -2072,6 +2073,9 @@ class JobFlags : public FlagSet<uint32_t> {
   FLAGSET_DEFINE_FLAG_ACCESSORS(Task_IsContinuingAsyncTask,
                                 task_isContinuingAsyncTask,
                                 task_setIsContinuingAsyncTask)
+  FLAGSET_DEFINE_FLAG_ACCESSORS(Task_IsAsyncLetTask,
+                                task_isAsyncLetTask,
+                                task_setIsAsyncLetTask)
 };
 
 /// Kinds of task status record.
@@ -2104,7 +2108,9 @@ enum class TaskStatusRecordKind : uint8_t {
 /// Kinds of option records that can be passed to creating asynchronous tasks.
 enum class TaskOptionRecordKind : uint8_t {
   /// Request a task to be kicked off, or resumed, on a specific executor.
-  Executor = 0,
+  Executor  = 0,
+  /// Request a child task to be part of a specific task group.
+  TaskGroup = 1,
 };
 
 /// Flags for cancellation records.

include/swift/ABI/TaskOptions.h

@@ -56,6 +56,24 @@ class TaskOptionRecord {
 
 };
 
+/******************************************************************************/
+/****************************** TASK OPTIONS **********************************/
+/******************************************************************************/
+
+class TaskGroupTaskOptionRecord : public TaskOptionRecord {
+  TaskGroup *Group;
+
+  public:
+    TaskGroupTaskOptionRecord(TaskGroup *group)
+    : TaskOptionRecord(TaskOptionRecordKind::TaskGroup),
+      Group(group) {}
+
+  TaskGroup *getGroup() const {
+    return Group;
+  }
+};
+
+
 /// Task option to specify on what executor the task should be executed.
 ///
 /// Not passing this option implies that that a "best guess" or good default

include/swift/Runtime/Concurrency.h

@@ -36,8 +36,7 @@ struct AsyncTaskAndContext {
   AsyncContext *InitialContext;
 };
 
-/// Create a task object with no future which will run the given
-/// function.
+/// Create a task object with no future which will run the given function.
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 AsyncTaskAndContext swift_task_create_f(
     size_t flags,
@@ -49,17 +48,15 @@ AsyncTaskAndContext swift_task_create_f(
 using FutureAsyncSignature =
   AsyncSignature<void(void*), /*throws*/ true>;
 
-/// Create a task object with a future which will run the given
-/// closure.
+/// Create a task object with a future which will run the given closure.
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 AsyncTaskAndContext swift_task_create_future(
     size_t flags,
     TaskOptionRecord *options,
     const Metadata *futureResultType,
     void *closureEntryPoint, HeapObject * /* +1 */ closureContext);
 
-/// Create a task object with a future which will run the given
-/// function.
+/// Create a task object with a future which will run the given function.
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 AsyncTaskAndContext swift_task_create_future_f(
     size_t flags,

stdlib/public/CompatibilityOverride/CompatibilityOverrideConcurrency.def

@@ -103,10 +103,9 @@ OVERRIDE_TASK(task_create_group_future_common, AsyncTaskAndContext, , , ,
                const Metadata *futureResultType,
                FutureAsyncSignature::FunctionType *function,
                void *closureContext,
-               bool isAsyncLetTask,
                size_t initialContextSize),
               (flags, group, options, futureResultType, function, closureContext,
-               isAsyncLetTask, initialContextSize))
+               initialContextSize))
 
 OVERRIDE_TASK(task_future_wait, void, SWIFT_EXPORT_FROM(swift_Concurrency),
               SWIFT_CC(swiftasync), swift::,

stdlib/public/Concurrency/Task.cpp

@@ -388,7 +388,6 @@ static void task_wait_throwing_resume_adapter(SWIFT_ASYNC_CONTEXT AsyncContext *
 SWIFT_CC(swiftasync)
 static void
 task_future_wait_resume_adapter(SWIFT_ASYNC_CONTEXT AsyncContext *_context) {
-
   return _context->ResumeParent(_context->Parent);
 }
 
@@ -404,10 +403,11 @@ static AsyncTaskAndContext swift_task_create_group_future_commonImpl(
     TaskOptionRecord *options,
     const Metadata *futureResultType,
     FutureAsyncSignature::FunctionType *function, void *closureContext,
-    bool isAsyncLetTask, // TODO: express as a bit in the rawFlags? -- ktoso
     size_t initialContextSize) {
   JobFlags flags(rawFlags);
+  bool isAsyncLetTask = flags.task_isAsyncLetTask();
   assert((futureResultType != nullptr) == flags.task_isFuture());
+  assert(!isAsyncLetTask || isAsyncLetTask == flags.task_isChildTask());
   assert(!flags.task_isFuture() ||
          initialContextSize >= sizeof(FutureAsyncContext));
   assert((group != nullptr) == flags.task_isGroupChildTask());
@@ -585,7 +585,6 @@ static AsyncTaskAndContext swift_task_create_group_future_common(
     TaskOptionRecord *options,
     const Metadata *futureResultType,
     FutureAsyncSignature::FunctionType *function, void *closureContext,
-    bool isAsyncLetTask,
     size_t initialContextSize);
 
 AsyncTaskAndContext
@@ -624,7 +623,6 @@ AsyncTaskAndContext swift::swift_task_create_group_future_f(
                                                options,
                                                futureResultType,
                                                function, /*closureContext=*/nullptr,
-                                               /*isAsyncLetTask=*/false,
                                                initialContextSize);
 }
 
@@ -664,12 +662,11 @@ AsyncTaskAndContext swift::swift_task_create_future(
       options,
       futureResultType,
       taskEntry, closureContext,
-      /*isAsyncLetTask*/false,
       initialContextSize);
 }
 
 AsyncTaskAndContext swift::swift_task_create_async_let_future(
-                     size_t flags,
+                     size_t rawFlags,
                      TaskOptionRecord *options,
                      const Metadata *futureResultType,
                      void *closureEntry, void *closureContext) {
@@ -681,13 +678,14 @@ AsyncTaskAndContext swift::swift_task_create_async_let_future(
       SpecialPointerAuthDiscriminators::AsyncFutureFunction
     >(closureEntry, (HeapObject *)closureContext);
 
+  JobFlags flags(rawFlags);
+  flags.task_setIsAsyncLetTask(true);
   return swift_task_create_group_future_common(
-      flags,
+      flags.getOpaqueValue(),
       /*group*/nullptr,
       options,
       futureResultType,
       taskEntry, closureContext,
-      /*isAsyncLetTask*/true,
       initialContextSize);
 }
 
@@ -712,7 +710,6 @@ swift::swift_task_create_group_future(
       options,
       futureResultType,
       taskEntry, closureContext,
-      /*isAsyncLetTask*/false,
       initialContextSize);
 }