[6.2][Concurrency] Update task name APIs, move to modifying AEIC funcs

Runtimes/Core/Concurrency/CMakeLists.txt

@@ -1,5 +1,6 @@
 add_subdirectory(InternalShims)
 
+gyb_expand(Task+init.swift.gyb Task+init.swift)
 gyb_expand(TaskGroup+addTask.swift.gyb TaskGroup+addTask.swift)
 gyb_expand(Task+startSynchronously.swift.gyb Task+startSynchronously.swift)
 
@@ -89,10 +90,10 @@ add_library(swift_Concurrency
   Task+TaskExecutor.swift
   TaskCancellation.swift
   TaskGroup.swift
-  TaskGroup+Embedded.swift
   TaskLocal.swift
   TaskSleep.swift
   TaskSleepDuration.swift
+  "${CMAKE_CURRENT_BINARY_DIR}/Task+init.swift"
   "${CMAKE_CURRENT_BINARY_DIR}/TaskGroup+addTask.swift"
   "${CMAKE_CURRENT_BINARY_DIR}/Task+startSynchronously.swift")
 

cmake/modules/SwiftSetIfArchBitness.cmake

@@ -27,15 +27,15 @@ function(set_if_arch_bitness var_name)
      "${SIA_ARCH}" STREQUAL "powerpc")
     set("${var_name}" "${SIA_CASE_32_BIT}" PARENT_SCOPE)
   elseif("${SIA_ARCH}" STREQUAL "x86_64" OR
-         "${SIA_ARCH}" STREQUAL "amd64" OR
-         "${SIA_ARCH}" STREQUAL "arm64" OR
-         "${SIA_ARCH}" STREQUAL "arm64e" OR
-         "${SIA_ARCH}" STREQUAL "aarch64" OR
-         "${SIA_ARCH}" STREQUAL "powerpc64" OR
-         "${SIA_ARCH}" STREQUAL "powerpc64le" OR
-         "${SIA_ARCH}" STREQUAL "s390x" OR
-         "${SIA_ARCH}" STREQUAL "riscv64" OR
-         "${SIA_ARCH}" STREQUAL "wasm64")
+     "${SIA_ARCH}" STREQUAL "amd64" OR
+     "${SIA_ARCH}" STREQUAL "arm64" OR
+     "${SIA_ARCH}" STREQUAL "arm64e" OR
+     "${SIA_ARCH}" STREQUAL "aarch64" OR
+     "${SIA_ARCH}" STREQUAL "powerpc64" OR
+     "${SIA_ARCH}" STREQUAL "powerpc64le" OR
+     "${SIA_ARCH}" STREQUAL "s390x" OR
+     "${SIA_ARCH}" STREQUAL "riscv64" OR
+     "${SIA_ARCH}" STREQUAL "wasm64")
     set("${var_name}" "${SIA_CASE_64_BIT}" PARENT_SCOPE)
   else()
     message(FATAL_ERROR "Unknown architecture: ${SIA_ARCH}")

stdlib/cmake/modules/AddSwiftStdlib.cmake

@@ -822,6 +822,7 @@ function(add_swift_target_library_single target name)
         IS_FRAGILE)
   set(SWIFTLIB_SINGLE_single_parameter_options
         ARCHITECTURE
+        ARCHITECTURE_SUBDIR_NAME
         DEPLOYMENT_VERSION_IOS
         DEPLOYMENT_VERSION_OSX
         DEPLOYMENT_VERSION_TVOS
@@ -888,6 +889,9 @@ function(add_swift_target_library_single target name)
   precondition(SWIFTLIB_SINGLE_SDK MESSAGE "Should specify an SDK")
   precondition(SWIFTLIB_SINGLE_ARCHITECTURE MESSAGE "Should specify an architecture")
   precondition(SWIFTLIB_SINGLE_INSTALL_IN_COMPONENT MESSAGE "INSTALL_IN_COMPONENT is required")
+  if (NOT SWIFTLIB_SINGLE_ARCHITECTURE_SUBDIR_NAME)
+    set(SWIFTLIB_SINGLE_ARCHITECTURE_SUBDIR_NAME "${SWIFTLIB_SINGLE_ARCHITECTURE}")
+  endif()
 
   if(NOT SWIFTLIB_SINGLE_SHARED AND
      NOT SWIFTLIB_SINGLE_STATIC AND
@@ -903,12 +907,12 @@ function(add_swift_target_library_single target name)
 
   # Determine the subdirectory where this library will be installed.
   set(SWIFTLIB_SINGLE_SUBDIR
-      "${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_LIB_SUBDIR}/${SWIFTLIB_SINGLE_ARCHITECTURE}")
+      "${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_LIB_SUBDIR}/${SWIFTLIB_SINGLE_ARCHITECTURE_SUBDIR_NAME}")
 
   # macCatalyst ios-like builds are installed in the maccatalyst/x86_64 directory
   if(maccatalyst_build_flavor STREQUAL "ios-like")
     set(SWIFTLIB_SINGLE_SUBDIR
-        "${SWIFT_SDK_MACCATALYST_LIB_SUBDIR}/${SWIFTLIB_SINGLE_ARCHITECTURE}")
+        "${SWIFT_SDK_MACCATALYST_LIB_SUBDIR}/${SWIFTLIB_SINGLE_ARCHITECTURE_SUBDIR_NAME}")
   endif()
 
   if ("${SWIFTLIB_SINGLE_BOOTSTRAPPING}" STREQUAL "")
@@ -1033,6 +1037,7 @@ function(add_swift_target_library_single target name)
         ${SWIFTLIB_SINGLE_LINK_LIBRARIES}
       SDK ${SWIFTLIB_SINGLE_SDK}
       ARCHITECTURE ${SWIFTLIB_SINGLE_ARCHITECTURE}
+      ARCHITECTURE_SUBDIR_NAME ${SWIFTLIB_SINGLE_ARCHITECTURE_SUBDIR_NAME}
       MODULE_NAME ${module_name}
       MODULE_DIR ${SWIFTLIB_SINGLE_MODULE_DIR}
       COMPILE_FLAGS ${SWIFTLIB_SINGLE_SWIFT_COMPILE_FLAGS}
@@ -1058,9 +1063,9 @@ function(add_swift_target_library_single target name)
 
   # If there were any swift sources, then a .swiftmodule may have been created.
   # If that is the case, then add a target which is an alias of the module files.
-  set(VARIANT_SUFFIX "-${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_LIB_SUBDIR}-${SWIFTLIB_SINGLE_ARCHITECTURE}")
+  set(VARIANT_SUFFIX "-${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_LIB_SUBDIR}-${SWIFTLIB_SINGLE_ARCHITECTURE_SUBDIR_NAME}")
   if(maccatalyst_build_flavor STREQUAL "ios-like")
-    set(VARIANT_SUFFIX "-${SWIFT_SDK_MACCATALYST_LIB_SUBDIR}-${SWIFTLIB_SINGLE_ARCHITECTURE}")
+    set(VARIANT_SUFFIX "-${SWIFT_SDK_MACCATALYST_LIB_SUBDIR}-${SWIFTLIB_SINGLE_ARCHITECTURE_SUBDIR_NAME}")
   endif()
 
   if(NOT "${SWIFTLIB_SINGLE_MODULE_TARGETS}" STREQUAL "" AND NOT "${swift_module_dependency_target}" STREQUAL "")

stdlib/cmake/modules/SwiftSource.cmake

@@ -50,7 +50,7 @@ function(handle_swift_sources
     sourcesvar externalvar name)
   cmake_parse_arguments(SWIFTSOURCES
       "IS_MAIN;IS_STDLIB;IS_STDLIB_CORE;IS_SDK_OVERLAY;EMBED_BITCODE;STATIC;NO_LINK_NAME;IS_FRAGILE;ONLY_SWIFTMODULE;NO_SWIFTMODULE"
-      "SDK;ARCHITECTURE;INSTALL_IN_COMPONENT;DEPLOYMENT_VERSION_OSX;DEPLOYMENT_VERSION_IOS;DEPLOYMENT_VERSION_TVOS;DEPLOYMENT_VERSION_WATCHOS;MACCATALYST_BUILD_FLAVOR;BOOTSTRAPPING;INSTALL_BINARY_SWIFTMODULE"
+      "SDK;ARCHITECTURE;ARCHITECTURE_SUBDIR_NAME;INSTALL_IN_COMPONENT;DEPLOYMENT_VERSION_OSX;DEPLOYMENT_VERSION_IOS;DEPLOYMENT_VERSION_TVOS;DEPLOYMENT_VERSION_WATCHOS;MACCATALYST_BUILD_FLAVOR;BOOTSTRAPPING;INSTALL_BINARY_SWIFTMODULE"
       "DEPENDS;COMPILE_FLAGS;MODULE_NAME;MODULE_DIR;ENABLE_LTO"
       ${ARGN})
   translate_flag(${SWIFTSOURCES_IS_MAIN} "IS_MAIN" IS_MAIN_arg)
@@ -83,6 +83,9 @@ function(handle_swift_sources
   precondition(SWIFTSOURCES_SDK "Should specify an SDK")
   precondition(SWIFTSOURCES_ARCHITECTURE "Should specify an architecture")
   precondition(SWIFTSOURCES_INSTALL_IN_COMPONENT "INSTALL_IN_COMPONENT is required")
+  if (NOT SWIFTSOURCES_ARCHITECTURE_SUBDIR_NAME)
+    set(SWIFTSOURCES_ARCHITECTURE_SUBDIR_NAME "${SWIFTSOURCES_ARCHITECTURE}")
+  endif()
 
   # Clear the result variable.
   set("${dependency_target_out_var_name}" "" PARENT_SCOPE)
@@ -108,12 +111,12 @@ function(handle_swift_sources
   endif()
 
   if(swift_sources)
-    set(objsubdir "/${SWIFTSOURCES_SDK}/${SWIFTSOURCES_ARCHITECTURE}")
+    set(objsubdir "/${SWIFTSOURCES_SDK}/${SWIFTSOURCES_ARCHITECTURE_SUBDIR_NAME}")
 
     get_maccatalyst_build_flavor(maccatalyst_build_flavor
       "${SWIFTSOURCES_SDK}" "${SWIFTSOURCES_MACCATALYST_BUILD_FLAVOR}")
     if(maccatalyst_build_flavor STREQUAL "ios-like")
-      set(objsubdir "/MACCATALYST/${SWIFTSOURCES_ARCHITECTURE}")
+      set(objsubdir "/MACCATALYST/${SWIFTSOURCES_ARCHITECTURE_SUBDIR_NAME}")
     endif()
 
     get_bootstrapping_path(lib_dir

stdlib/public/Concurrency/CMakeLists.txt

@@ -129,7 +129,6 @@ set(SWIFT_RUNTIME_CONCURRENCY_SWIFT_SOURCES
   Task+TaskExecutor.swift
   TaskCancellation.swift
   TaskGroup.swift
-  TaskGroup+Embedded.swift
   DiscardingTaskGroup.swift
   TaskLocal.swift
   TaskSleep.swift
@@ -199,15 +198,20 @@ set(LLVM_OPTIONAL_SOURCES
   DispatchGlobalExecutor.cpp
 )
 
+set(SWIFT_CONCURRENCY_GYB_SOURCES
+  Task+init.swift.gyb
+  TaskGroup+addTask.swift.gyb
+  Task+startSynchronously.swift.gyb
+)
+
 add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   ${SWIFT_RUNTIME_CONCURRENCY_C_SOURCES}
   ${SWIFT_RUNTIME_CONCURRENCY_EXECUTOR_SOURCES}
   ${SWIFT_RUNTIME_CONCURRENCY_SWIFT_SOURCES}
   ${SWIFT_RUNTIME_CONCURRENCY_NONEMBEDDED_SWIFT_SOURCES}
 
   GYB_SOURCES
-    TaskGroup+addTask.swift.gyb
-    Task+startSynchronously.swift.gyb
+    ${SWIFT_CONCURRENCY_GYB_SOURCES}
 
   SWIFT_MODULE_DEPENDS_ANDROID Android
   SWIFT_MODULE_DEPENDS_LINUX Glibc
@@ -295,8 +299,10 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
     endif()
 
     set(SWIFT_SDK_embedded_THREADING_PACKAGE none)
+    set(SWIFT_SDK_embedded_ARCH_${arch}_MODULE "${mod}")
     set(SWIFT_SDK_embedded_ARCH_${mod}_MODULE "${mod}")
     set(SWIFT_SDK_embedded_LIB_SUBDIR "embedded")
+    set(SWIFT_SDK_embedded_ARCH_${arch}_TRIPLE "${triple}")
     set(SWIFT_SDK_embedded_ARCH_${mod}_TRIPLE "${triple}")
 
     # lib/swift/embedded/_Concurrency.swiftmodule
@@ -311,6 +317,9 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
       ${SWIFT_RUNTIME_CONCURRENCY_SWIFT_SOURCES}
       ${SWIFT_RUNTIME_CONCURRENCY_EMBEDDED_SWIFT_SOURCES}
 
+      GYB_SOURCES
+        ${SWIFT_CONCURRENCY_GYB_SOURCES}
+
       SWIFT_COMPILE_FLAGS
         ${extra_swift_compile_flags} -enable-experimental-feature Embedded
         -parse-stdlib -DSWIFT_CONCURRENCY_EMBEDDED
@@ -320,7 +329,8 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
         ${extra_c_compile_flags} ${SWIFT_RUNTIME_CONCURRENCY_C_FLAGS} -DSWIFT_CONCURRENCY_EMBEDDED=1 -DSWIFT_RUNTIME_EMBEDDED=1
       MODULE_DIR "${CMAKE_BINARY_DIR}/lib/swift/embedded"
       SDK "embedded"
-      ARCHITECTURE "${mod}"
+      ARCHITECTURE "${arch}"
+      ARCHITECTURE_SUBDIR_NAME "${mod}"
       DEPENDS embedded-stdlib-${mod}
       INSTALL_IN_COMPONENT stdlib
       )

stdlib/public/Concurrency/SourceCompatibilityShims.swift

@@ -87,175 +87,6 @@ extension Task where Success == Never, Failure == Never {
   }
 }
 
-@available(SwiftStdlib 5.1, *)
-extension Task where Failure == Error {
-  #if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-  @discardableResult
-  @_alwaysEmitIntoClient
-  @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-  public static func runDetached(
-    priority: TaskPriority? = nil,
-    operation: __owned @Sendable @escaping () async throws -> Success
-  ) -> Task<Success, Failure> {
-    fatalError("Unavailable in task-to-thread concurrency model")
-  }
-  #else
-  @discardableResult
-  @_alwaysEmitIntoClient
-  @available(*, deprecated, message: "`Task.runDetached` was replaced by `Task.detached` and will be removed shortly.")
-  public static func runDetached(
-    priority: TaskPriority? = nil,
-    operation: __owned @Sendable @escaping () async throws -> Success
-  ) -> Task<Success, Failure> {
-    detached(priority: priority, operation: operation)
-  }
-  #endif
-}
-
-#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-@discardableResult
-@available(SwiftStdlib 5.1, *)
-@available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-@_alwaysEmitIntoClient
-public func detach<T>(
-  priority: TaskPriority? = nil,
-  operation: __owned @Sendable @escaping () async -> T
-) -> Task<T, Never> {
-  fatalError("Unavailable in task-to-thread concurrency model")
-}
-#else
-@discardableResult
-@available(SwiftStdlib 5.1, *)
-@available(*, deprecated, message: "`detach` was replaced by `Task.detached` and will be removed shortly.")
-@_alwaysEmitIntoClient
-public func detach<T>(
-  priority: TaskPriority? = nil,
-  operation: __owned @Sendable @escaping () async -> T
-) -> Task<T, Never> {
-  Task.detached(priority: priority, operation: operation)
-}
-#endif
-
-#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-@discardableResult
-@available(SwiftStdlib 5.1, *)
-@available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-@_alwaysEmitIntoClient
-public func detach<T>(
-  priority: TaskPriority? = nil,
-  operation: __owned @Sendable @escaping () async throws -> T
-) -> Task<T, Error> {
-  fatalError("Unavailable in task-to-thread concurrency model")
-}
-#else
-@discardableResult
-@available(SwiftStdlib 5.1, *)
-@available(*, deprecated, message: "`detach` was replaced by `Task.detached` and will be removed shortly.")
-@_alwaysEmitIntoClient
-public func detach<T>(
-  priority: TaskPriority? = nil,
-  operation: __owned @Sendable @escaping () async throws -> T
-) -> Task<T, Error> {
-  Task.detached(priority: priority, operation: operation)
-}
-#endif
-
-#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-@discardableResult
-@available(SwiftStdlib 5.1, *)
-@available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-@_alwaysEmitIntoClient
-public func asyncDetached<T>(
-  priority: TaskPriority? = nil,
-  @_implicitSelfCapture operation: __owned @Sendable @escaping () async -> T
-) -> Task<T, Never> {
-  fatalError("Unavailable in task-to-thread concurrency model")
-}
-#else
-@discardableResult
-@available(SwiftStdlib 5.1, *)
-@available(*, deprecated, message: "`asyncDetached` was replaced by `Task.detached` and will be removed shortly.")
-@_alwaysEmitIntoClient
-public func asyncDetached<T>(
-  priority: TaskPriority? = nil,
-  @_implicitSelfCapture operation: __owned @Sendable @escaping () async -> T
-) -> Task<T, Never> {
-  return Task.detached(priority: priority, operation: operation)
-}
-#endif
-
-#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-@discardableResult
-@available(SwiftStdlib 5.1, *)
-@available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-@_alwaysEmitIntoClient
-public func asyncDetached<T>(
-  priority: TaskPriority? = nil,
-  @_implicitSelfCapture operation: __owned @Sendable @escaping () async throws -> T
-) -> Task<T, Error> {
-  fatalError("Unavailable in task-to-thread concurrency model")
-}
-#else
-@discardableResult
-@available(SwiftStdlib 5.1, *)
-@available(*, deprecated, message: "`asyncDetached` was replaced by `Task.detached` and will be removed shortly.")
-@_alwaysEmitIntoClient
-public func asyncDetached<T>(
-  priority: TaskPriority? = nil,
-  @_implicitSelfCapture operation: __owned @Sendable @escaping () async throws -> T
-) -> Task<T, Error> {
-  return Task.detached(priority: priority, operation: operation)
-}
-#endif
-
-#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-@available(SwiftStdlib 5.1, *)
-@available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-@discardableResult
-@_alwaysEmitIntoClient
-public func async<T>(
-  priority: TaskPriority? = nil,
-  @_inheritActorContext @_implicitSelfCapture operation: __owned @Sendable @escaping () async -> T
-) -> Task<T, Never> {
-  fatalError("Unavailable in task-to-thread concurrency model")
-}
-#else
-@available(SwiftStdlib 5.1, *)
-@available(*, deprecated, message: "`async` was replaced by `Task.init` and will be removed shortly.")
-@discardableResult
-@_alwaysEmitIntoClient
-public func async<T>(
-  priority: TaskPriority? = nil,
-  @_inheritActorContext @_implicitSelfCapture operation: __owned @Sendable @escaping () async -> T
-) -> Task<T, Never> {
-  .init(priority: priority, operation: operation)
-}
-#endif
-
-#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
-@available(SwiftStdlib 5.1, *)
-@available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
-@discardableResult
-@_alwaysEmitIntoClient
-public func async<T>(
-  priority: TaskPriority? = nil,
-  @_inheritActorContext @_implicitSelfCapture operation: __owned @Sendable @escaping () async throws -> T
-) -> Task<T, Error> {
-  fatalError("Unavailable in task-to-thread concurrency model")
-}
-#else
-@available(SwiftStdlib 5.1, *)
-@available(*, deprecated, message: "`async` was replaced by `Task.init` and will be removed shortly.")
-@discardableResult
-@_alwaysEmitIntoClient
-public func async<T>(
-  priority: TaskPriority? = nil,
-  @_inheritActorContext @_implicitSelfCapture operation: __owned @Sendable @escaping () async throws -> T
-) -> Task<T, Error> {
-  .init(priority: priority, operation: operation)
-}
-#endif
-
 @available(SwiftStdlib 5.1, *)
 extension Task where Success == Never, Failure == Never {
   @available(*, deprecated, message: "`Task.Group` was replaced by `ThrowingTaskGroup` and `TaskGroup` and will be removed shortly.")