[Concurrency] introduce gyb file to generate addTask implementations

Author: ktoso

Runtimes/Core/Concurrency/CMakeLists.txt

@@ -1,5 +1,7 @@
 add_subdirectory(InternalShims)
 
+gyb_expand(TaskGroup+addTask.swift.gyb TaskGroup+addTask.swift)
+
 add_library(swift_Concurrency
   Actor.cpp
   AsyncLet.cpp
@@ -77,10 +79,11 @@ add_library(swift_Concurrency
   Task+TaskExecutor.swift
   TaskCancellation.swift
   TaskGroup.swift
-  TaskGroup+TaskExecutor.swift
   TaskLocal.swift
   TaskSleep.swift
-  TaskSleepDuration.swift)
+  TaskSleepDuration.swift
+  "${CMAKE_CURRENT_BINARY_DIR}/TaskGroup+addTask.swift")
+
 include(${SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR}.cmake)
 target_compile_definitions(swift_Concurrency PRIVATE
   $<$<COMPILE_LANGUAGE:C,CXX>:-DSWIFT_TARGET_LIBRARY_NAME=swift_Concurrency>

lib/AST/Builtins.cpp

@@ -219,19 +219,6 @@ _generics(ParamS... params) {
   return {{params...}};
 }
 
-///// A conditional synthesizer which generates a generic parameter list.
-///// If the 'condition' is false, no generic parameters are created.
-//template <class... ParamS>
-//struct ConditionalGenericParamListSynthesizer {
-//  bool condition;
-//  VariadicSynthesizerStorage<ParamS...> Params;
-//};
-//template <class... ParamS>
-//constexpr ConditionalGenericParamListSynthesizer<ParamS...>
-//_ifGenerics(bool condition, ParamS... params) {
-//  return {condition, {params...}};
-//}
-
 struct CountGenericParameters {
   unsigned &Count;
 
@@ -305,21 +292,6 @@ static GenericParamList *synthesizeGenericParamList(SynthesisContext &SC,
   return paramList;
 }
 
-//template <class... ParamsS>
-//static GenericParamList *synthesizeGenericParamList(
-//    SynthesisContext &SC,
-//    const ConditionalGenericParamListSynthesizer<ParamsS...> &params) {
-//  if (params.condition) {
-//    unsigned count = 0;
-//    params.Params.visit(CountGenericParameters{count});
-//    auto paramList = getGenericParams(SC.Context, count);
-//    SC.GenericParams = paramList;
-//    return paramList;
-//  } else {
-//    return GenericParamList::create(SC.Context, SourceLoc(), {}, SourceLoc());
-//  }
-//}
-
 namespace {
 struct CollectGenericParams {
   SynthesisContext &SC;
@@ -369,24 +341,6 @@ synthesizeGenericSignature(SynthesisContext &SC,
                                /*allowInverses=*/false);
 }
 
-//template <class... ParamsS>
-//static GenericSignature
-//synthesizeGenericSignature(SynthesisContext &SC,
-//                     const ConditionalGenericParamListSynthesizer<ParamsS...> &list) {
-//  CollectGenericParams collector(SC);
-//  if (list.condition) {
-//    list.Params.visit(collector);
-//
-//    return buildGenericSignature(SC.Context,
-//                                 GenericSignature(),
-//                                 std::move(collector.GenericParamTypes),
-//                                 std::move(collector.AddedRequirements),
-//                                 /*allowInverses=*/false);
-//  } else {
-//    return GenericSignature();
-//  }
-//}
-
 /// Build a builtin function declaration.
 ///
 /// This is a "legacy" interface; you should probably use one of

lib/IRGen/GenConcurrency.cpp

@@ -857,13 +857,6 @@ irgen::emitTaskCreate(IRGenFunction &IGF, llvm::Value *flags,
   }
 
   // Add an option record for the initial task name, if present.
-  //
-  //    (lldb) e taskName.value.Values[0]
-  //        (llvm::Value *) $11 = 0x000060000220d1a0
-  //    (lldb) e taskName.value.Values[0]->dump()
-  //        %16 = extractvalue { i64, i64 } %15, 0
-  //    (lldb) e taskName.value.Values[1]->dump()
-  //       %17 = extractvalue { i64, i64 } %15, 1
   taskOptions = maybeAddTaskNameOptionRecord(IGF, taskOptions, taskName);
 
   // In embedded Swift, create and pass result type info.

stdlib/public/Concurrency/CMakeLists.txt

@@ -144,7 +144,7 @@ set(SWIFT_RUNTIME_CONCURRENCY_SWIFT_SOURCES
   Task+TaskExecutor.swift
   TaskCancellation.swift
   TaskGroup.swift
-  TaskGroup+TaskExecutor.swift
+  TaskGroup+Embedded.swift
   DiscardingTaskGroup.swift
   TaskLocal.swift
   TaskSleep.swift
@@ -181,6 +181,9 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
   ${SWIFT_RUNTIME_CONCURRENCY_EXECUTOR_SOURCES}
   ${SWIFT_RUNTIME_CONCURRENCY_SWIFT_SOURCES}
 
+  GYB_SOURCES
+    TaskGroup+addTask.swift.gyb
+
   SWIFT_MODULE_DEPENDS_ANDROID Android
   SWIFT_MODULE_DEPENDS_LINUX Glibc
   SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
@@ -274,6 +277,9 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
       ${SWIFT_RUNTIME_CONCURRENCY_C_SOURCES}
       ${SWIFT_RUNTIME_CONCURRENCY_SWIFT_SOURCES}
 
+      # FIXME: Need to include the TaskGroup+addTask.swift.gyb here,
+      #        but there's trouble with that: Unknown architecture: x86_64-apple-macos
+
       SWIFT_COMPILE_FLAGS
         ${extra_swift_compile_flags} -enable-experimental-feature Embedded
         -parse-stdlib -DSWIFT_CONCURRENCY_EMBEDDED

stdlib/public/Concurrency/DiscardingTaskGroup.swift

@@ -186,152 +186,6 @@ public struct DiscardingTaskGroup {
     let _: Void? = try await _taskGroupWaitAll(group: _group, bodyError: nil)
   }
 
-  /// Adds a child task to the group.
-  ///
-  /// - Parameters:
-  ///   - priority: The priority of the operation task.
-  ///     Omit this parameter or pass `.unspecified`
-  ///     to set the child task's priority to the priority of the group.
-  ///   - operation: The operation to execute as part of the task group.
-  @_alwaysEmitIntoClient
-  #if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-  @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model", renamed: "addTask(operation:)")
-  #endif
-  public mutating func addTask(
-    priority: TaskPriority? = nil,
-    operation: sending @escaping @isolated(any) () async -> Void
-  ) {
-#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-    let flags = taskCreateFlags(
-      priority: priority, isChildTask: true, copyTaskLocals: false,
-      inheritContext: false, enqueueJob: false,
-      addPendingGroupTaskUnconditionally: true, isDiscardingTask: true
-    )
-#else
-    let flags = taskCreateFlags(
-      priority: priority, isChildTask: true, copyTaskLocals: false,
-      inheritContext: false, enqueueJob: true,
-      addPendingGroupTaskUnconditionally: true, isDiscardingTask: true
-    )
-#endif
-
-    // Create the task in this group.
-    let builtinSerialExecutor =
-      Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
-
-    _ = Builtin.createDiscardingTask(flags: flags,
-                                     initialSerialExecutor: builtinSerialExecutor,
-                                     taskGroup: _group,
-                                     operation: operation)
-  }
-
-  /// Adds a child task to the group, unless the group has been canceled.
-  ///
-  /// - Parameters:
-  ///   - priority: The priority of the operation task.
-  ///     Omit this parameter or pass `.unspecified`
-  ///     to set the child task's priority to the priority of the group.
-  ///   - operation: The operation to execute as part of the task group.
-  /// - Returns: `true` if the child task was added to the group;
-  ///   otherwise `false`.
-  @_alwaysEmitIntoClient
-  #if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-  @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model", renamed: "addTask(operation:)")
-  #endif
-  public mutating func addTaskUnlessCancelled(
-    priority: TaskPriority? = nil,
-    operation: sending @escaping @isolated(any) () async -> Void
-  ) -> Bool {
-    let canAdd = _taskGroupAddPendingTask(group: _group, unconditionally: false)
-
-    guard canAdd else {
-      // the group is cancelled and is not accepting any new work
-      return false
-    }
-#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-    let flags = taskCreateFlags(
-      priority: priority, isChildTask: true, copyTaskLocals: false,
-      inheritContext: false, enqueueJob: false,
-      addPendingGroupTaskUnconditionally: false, isDiscardingTask: true
-    )
-#else
-    let flags = taskCreateFlags(
-      priority: priority, isChildTask: true, copyTaskLocals: false,
-      inheritContext: false, enqueueJob: true,
-      addPendingGroupTaskUnconditionally: false, isDiscardingTask: true
-    )
-#endif
-
-    // Create the task in this group.
-    let builtinSerialExecutor =
-      Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
-
-    _ = Builtin.createDiscardingTask(flags: flags,
-                                     initialSerialExecutor: builtinSerialExecutor,
-                                     taskGroup: _group,
-                                     operation: operation)
-
-    return true
-  }
-
-  @_alwaysEmitIntoClient
-  public mutating func addTask(
-    operation: sending @escaping @isolated(any) () async -> Void
-  ) {
-    let flags = taskCreateFlags(
-      priority: nil, isChildTask: true, copyTaskLocals: false,
-      inheritContext: false, enqueueJob: true,
-      addPendingGroupTaskUnconditionally: true, isDiscardingTask: true
-    )
-
-    // Create the task in this group.
-    let builtinSerialExecutor =
-      Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
-
-    _ = Builtin.createDiscardingTask(flags: flags,
-                                     initialSerialExecutor: builtinSerialExecutor,
-                                     taskGroup: _group,
-                                     operation: operation)
-  }
-
-  /// Adds a child task to the group, unless the group has been canceled.
-  ///
-  /// - Parameters:
-  ///   - operation: The operation to execute as part of the task group.
-  /// - Returns: `true` if the child task was added to the group;
-  ///   otherwise `false`.
-#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-  @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model", renamed: "addTaskUnlessCancelled(operation:)")
-#endif
-  @_alwaysEmitIntoClient
-  public mutating func addTaskUnlessCancelled(
-    operation: sending @escaping @isolated(any) () async -> Void
-  ) -> Bool {
-    let canAdd = _taskGroupAddPendingTask(group: _group, unconditionally: false)
-
-    guard canAdd else {
-      // the group is cancelled and is not accepting any new work
-      return false
-    }
-
-    let flags = taskCreateFlags(
-      priority: nil, isChildTask: true, copyTaskLocals: false,
-      inheritContext: false, enqueueJob: true,
-      addPendingGroupTaskUnconditionally: false, isDiscardingTask: true
-    )
-
-    // Create the task in this group.
-    let builtinSerialExecutor =
-      Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
-
-    _ = Builtin.createDiscardingTask(flags: flags,
-                                     initialSerialExecutor: builtinSerialExecutor,
-                                     taskGroup: _group,
-                                     operation: operation)
-
-    return true
-  }
-
   /// A Boolean value that indicates whether the group has any remaining tasks.
   ///
   /// At the start of the body of a `withDiscardingTaskGroup(of:returning:body:)` call,
@@ -624,63 +478,6 @@ public struct ThrowingDiscardingTaskGroup<Failure: Error> {
     let _: Void? = try await _taskGroupWaitAll(group: _group, bodyError: bodyError)
   }
 
-#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-  @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model", renamed: "addTask(operation:)")
-#endif
-  @_alwaysEmitIntoClient
-  public mutating func addTask(
-    priority: TaskPriority? = nil,
-    operation: sending @escaping @isolated(any) () async throws -> Void
-  ) {
-    let flags = taskCreateFlags(
-      priority: priority, isChildTask: true, copyTaskLocals: false,
-      inheritContext: false, enqueueJob: true,
-      addPendingGroupTaskUnconditionally: true, isDiscardingTask: true
-    )
-
-    // Create the task in this group.
-    let builtinSerialExecutor =
-      Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
-
-    _ = Builtin.createDiscardingTask(flags: flags,
-                                     initialSerialExecutor: builtinSerialExecutor,
-                                     taskGroup: _group,
-                                     operation: operation)
-  }
-
-#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-  @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model", renamed: "addTask(operation:)")
-#endif
-  @_alwaysEmitIntoClient
-  public mutating func addTaskUnlessCancelled(
-    priority: TaskPriority? = nil,
-    operation: sending @escaping @isolated(any) () async throws -> Void
-  ) -> Bool {
-    let canAdd = _taskGroupAddPendingTask(group: _group, unconditionally: false)
-
-    guard canAdd else {
-      // the group is cancelled and is not accepting any new work
-      return false
-    }
-
-    let flags = taskCreateFlags(
-      priority: priority, isChildTask: true, copyTaskLocals: false,
-      inheritContext: false, enqueueJob: true,
-      addPendingGroupTaskUnconditionally: false, isDiscardingTask: true
-    )
-
-    // Create the task in this group.
-    let builtinSerialExecutor =
-      Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
-
-    _ = Builtin.createDiscardingTask(flags: flags,
-                                     initialSerialExecutor: builtinSerialExecutor,
-                                     taskGroup: _group,
-                                     operation: operation)
-
-    return true
-  }
-
   /// A Boolean value that indicates whether the group has any remaining tasks.
   ///
   /// At the start of the body of a `withThrowingDiscardingTaskGroup(returning:body:)` call,