Merge pull request swiftlang#36991 from apple/revert-36987-cherry-cleaner-abi-asynclet

Author: ktoso

include/swift/ABI/AsyncLet.h

@@ -49,9 +49,6 @@ enum {
 
   /// The number of words in a task group.
   NumWords_TaskGroup = 32,
-
-  /// The number of words in an AsyncLet (flags + task pointer)
-  NumWords_AsyncLet = 8, // TODO: not sure how much is enough, these likely could be pretty small
 };
 
 struct InProcess;
@@ -130,9 +127,6 @@ const size_t Alignment_DefaultActor = MaximumAlignment;
 /// The alignment of a TaskGroup.
 const size_t Alignment_TaskGroup = MaximumAlignment;
 
-/// The alignment of an AsyncLet.
-const size_t Alignment_AsyncLet = MaximumAlignment;
-
 /// Flags stored in the value-witness table.
 template <typename int_type>
 class TargetValueWitnessFlags {

include/swift/ABI/MetadataValues.h

@@ -29,8 +29,8 @@ namespace swift {
 /// The task group is responsible for maintaining dynamically created child tasks.
 class alignas(Alignment_TaskGroup) TaskGroup {
 public:
-  // These constructors do not initialize the group instance, and the
-  // destructor does not destroy the group instance; you must call
+  // These constructors do not initialize the actor instance, and the
+  // destructor does not destroy the actor instance; you must call
   // swift_taskGroup_{initialize,destroy} yourself.
   constexpr TaskGroup()
     : PrivateData{} {}
@@ -43,4 +43,4 @@ class alignas(Alignment_TaskGroup) TaskGroup {
 
 } // end namespace swift
 
-#endif // SWIFT_ABI_TASK_GROUP_H
+#endif

include/swift/ABI/TaskGroup.h

@@ -782,19 +782,6 @@ BUILTIN_MISC_OPERATION_WITH_SILGEN(GetCurrentAsyncTask, "getCurrentAsyncTask", "
 /// Cancel the given asynchronous task.
 BUILTIN_MISC_OPERATION_WITH_SILGEN(CancelAsyncTask, "cancelAsyncTask", "", Special)
 
-/// startAsyncLet()<T>: (
-///     __owned @Sendable @escaping () async throws -> T
-/// ) -> Builtin.RawPointer
-///
-/// Create, initialize and start a new async-let and associated task.
-/// Returns an AsyncLet* that must be passed to endAsyncLet for destruction.
-BUILTIN_MISC_OPERATION(StartAsyncLet, "startAsyncLet", "", Special)
-
-/// asyncLetEnd(): (Builtin.RawPointer) -> Void
-///
-/// Ends and destroys an async-let.
-BUILTIN_MISC_OPERATION_WITH_SILGEN(EndAsyncLet, "endAsyncLet", "", Special)
-
 /// createAsyncTaskFuture(): (
 ///     Int, Builtin.NativeObject?, @escaping () async throws -> T
 /// ) -> Builtin.NativeObject

include/swift/AST/Builtins.def

@@ -18,7 +18,6 @@
 #define SWIFT_RUNTIME_CONCURRENCY_H
 
 #include "swift/ABI/TaskGroup.h"
-#include "swift/ABI/AsyncLet.h"
 #include "swift/ABI/TaskStatus.h"
 
 #pragma clang diagnostic push
@@ -50,17 +49,15 @@ using FutureAsyncSignature =
 /// closure.
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 AsyncTaskAndContext swift_task_create_future(
-    JobFlags flags,
-    const Metadata *futureResultType,
+    JobFlags flags, const Metadata *futureResultType,
     void *closureEntryPoint,
     HeapObject * /* +1 */ closureContext);
 
 /// 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(
-    JobFlags flags,
-    const Metadata *futureResultType,
+    JobFlags flags, const Metadata *futureResultType,
     FutureAsyncSignature::FunctionType *function,
     size_t initialContextSize);
 
@@ -77,8 +74,7 @@ AsyncTaskAndContext swift_task_create_group_future(
 /// function, and offer its result to the task group
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 AsyncTaskAndContext swift_task_create_group_future_f(
-    JobFlags flags,
-    TaskGroup *group,
+    JobFlags flags, TaskGroup *group,
     const Metadata *futureResultType,
     FutureAsyncSignature::FunctionType *function,
     size_t initialContextSize);
@@ -173,7 +169,7 @@ SWIFT_CC(swiftasync)
 /// \code
 /// func swift_taskGroup_wait_next_throwing(
 ///     waitingTask: Builtin.NativeObject, // current task
-///     group: Builtin.RawPointer
+///     group: UnsafeRawPointer
 /// ) async -> T
 /// \endcode
 SWIFT_EXPORT_FROM(swift_Concurrency)
@@ -188,7 +184,8 @@ void swift_taskGroup_wait_next_throwing(
 /// Its Swift signature is
 ///
 /// \code
-/// func swift_taskGroup_initialize(group: Builtin.RawPointer)
+/// func swift_taskGroup_initialize(group: Builtin.RawPointer
+/// )
 /// \endcode
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 void swift_taskGroup_initialize(TaskGroup *group);
@@ -205,6 +202,7 @@ void swift_taskGroup_initialize(TaskGroup *group);
 /// \code
 /// func swift_taskGroup_attachChild(
 ///     group: Builtin.RawPointer,
+///     parent: Builtin.NativeObject,
 ///     child: Builtin.NativeObject
 /// )
 /// \endcode
@@ -216,7 +214,7 @@ void swift_taskGroup_attachChild(TaskGroup *group, AsyncTask *child);
 /// This function MUST be called from the AsyncTask running the task group.
 ///
 /// \code
-/// func swift_taskGroup_destroy(_ group: Builtin.RawPointer)
+/// func swift_taskGroup_destroy(_ group: UnsafeRawPointer)
 /// \endcode
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 void swift_taskGroup_destroy(TaskGroup *group);
@@ -246,7 +244,7 @@ bool swift_taskGroup_addPending(TaskGroup *group, bool unconditionally);
 /// Its Swift signature is
 ///
 /// \code
-/// func swift_taskGroup_cancelAll(group: Builtin.RawPointer)
+/// func swift_taskGroup_cancelAll(group: UnsafeRawPointer)
 /// \endcode
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 void swift_taskGroup_cancelAll(TaskGroup *group);
@@ -259,7 +257,7 @@ void swift_taskGroup_cancelAll(TaskGroup *group);
 /// This can be called from any thread. Its Swift signature is
 ///
 /// \code
-/// func swift_taskGroup_isCancelled(group: Builtin.RawPointer)
+/// func swift_taskGroup_isCancelled(group: UnsafeRawPointer)
 /// \endcode
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 bool swift_taskGroup_isCancelled(TaskGroup *group);
@@ -276,63 +274,6 @@ bool swift_taskGroup_isCancelled(TaskGroup *group);
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 bool swift_taskGroup_isEmpty(TaskGroup *group);
 
-/// Its Swift signature is
-///
-/// \code
-/// func swift_asyncLet_start<T>(
-///     _ alet: Builtin.RawPointer,
-///     operation: __owned @Sendable @escaping () async throws -> T
-/// )
-/// \endcode
-SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
-void swift_asyncLet_start(
-    AsyncLet *alet,
-    const Metadata *futureResultType,
-    void *closureEntryPoint,
-    HeapObject * /* +1 */ closureContext);
-
-/// This matches the ABI of a closure `<T>(Builtin.RawPointer) async -> T`
-using AsyncLetWaitSignature =
-    SWIFT_CC(swiftasync)
-    void(OpaqueValue *,
-         SWIFT_ASYNC_CONTEXT AsyncContext *, AsyncTask *, Metadata *);
-
-/// Wait for a non-throwing async-let to complete.
-///
-/// This can be called from any thread. Its Swift signature is
-///
-/// \code
-/// func swift_asyncLet_wait(
-///     _ asyncLet: _owned Builtin.RawPointer
-/// ) async -> Success
-/// \endcode
-SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swiftasync)
-void swift_asyncLet_wait(OpaqueValue *,
-                         SWIFT_ASYNC_CONTEXT AsyncContext *,
-                         AsyncLet *, Metadata *);
-
-/// Wait for a potentially-throwing async-let to complete.
-///
-/// This can be called from any thread. Its Swift signature is
-///
-/// \code
-/// func swift_asyncLet_wait_throwing(
-///     _ asyncLet: _owned Builtin.RawPointer
-/// ) async throws -> Success
-/// \endcode
-SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swiftasync)
-void swift_asyncLet_wait_throwing(OpaqueValue *,
-                                  SWIFT_ASYNC_CONTEXT AsyncContext *,
-                                  AsyncLet *, Metadata *);
-
-/// Its Swift signature is
-///
-/// \code
-/// func swift_asyncLet_end(_ alet: Builtin.RawPointer)
-/// \endcode
-SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
-void swift_asyncLet_end(AsyncLet *alet);
-
 /// Add a status record to a task.  The record should not be
 /// modified while it is registered with a task.
 ///
@@ -373,7 +314,8 @@ bool swift_task_removeStatusRecord(TaskStatusRecord *record);
 /// The record must be removed with by the parent invoking
 /// `swift_task_detachChild` when the child has completed.
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
-ChildTaskStatusRecord* swift_task_attachChild(AsyncTask *child);
+ChildTaskStatusRecord*
+swift_task_attachChild(AsyncTask *child);
 
 /// Remove a child task from the parent tracking it.
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)

include/swift/Runtime/Concurrency.h

@@ -1541,8 +1541,7 @@ FUNCTION(TaskCreateFunc,
 // AsyncTaskAndContext swift_task_create_future(
 //     size_t flags,
 //     const Metadata *futureResultType,
-//     void *closureEntry,
-//     HeapObject *closureContext);
+//     void *closureEntry, HeapObject *closureContext);
 FUNCTION(TaskCreateFuture,
          swift_task_create_future, SwiftCC,
          ConcurrencyAvailability,
@@ -1554,8 +1553,7 @@ FUNCTION(TaskCreateFuture,
 // AsyncTaskAndContext swift_task_create_future_f(
 //     size_t flags,
 //     const Metadata *futureResultType,
-//     TaskContinuationFunction *function,
-//     size_t contextSize);
+//     TaskContinuationFunction *function, size_t contextSize);
 FUNCTION(TaskCreateFutureFunc,
          swift_task_create_future_f, SwiftCC,
          ConcurrencyAvailability,
@@ -1565,11 +1563,9 @@ FUNCTION(TaskCreateFutureFunc,
          ATTRS(NoUnwind, ArgMemOnly))
 
 // AsyncTaskAndContext swift_task_create_group_future(
-//     size_t flags,
-//     TaskGroup *group,
+//     size_t flags, TaskGroup *group,
 //     const Metadata *futureResultType,
-//     void *closureEntry,
-//     HeapObject *closureContext);
+//     void *closureEntry, HeapObject *closureContext);
 FUNCTION(TaskCreateGroupFuture,
          swift_task_create_group_future, SwiftCC,
          ConcurrencyAvailability,
@@ -1580,11 +1576,9 @@ FUNCTION(TaskCreateGroupFuture,
          ATTRS(NoUnwind, ArgMemOnly))
 
 // AsyncTaskAndContext swift_task_create_group_future_f(
-//     size_t flags,
-//     TaskGroup *group,
+//     size_t flags, TaskGroup *group,
 //     const Metadata *futureResultType,
-//     TaskContinuationFunction *function,
-//     size_t contextSize);
+//     TaskContinuationFunction *function, size_t contextSize);
 FUNCTION(TaskCreateGroupFutureFunc,
          swift_task_create_group_future_f, SwiftCC,
          ConcurrencyAvailability,
@@ -1678,31 +1672,6 @@ FUNCTION(DefaultActorDeallocateResilient,
          ARGS(RefCountedPtrTy),
          ATTRS(NoUnwind))
 
-/// void swift_asyncLet_start(
-///     AsyncLet *alet,
-///     const Metadata *futureResultType,
-///     void *closureEntryPoint,
-///     HeapObject *closureContext
-/// );
-FUNCTION(AsyncLetStart,
-         swift_asyncLet_start, SwiftCC,
-         ConcurrencyAvailability,
-         RETURNS(VoidTy),
-         ARGS(SwiftAsyncLetPtrTy, // AsyncLet*, alias for Int8PtrTy
-              TypeMetadataPtrTy,  // futureResultType
-              Int8PtrTy,          // closureEntry
-              RefCountedPtrTy,    // closureContext
-         ),
-         ATTRS(NoUnwind, ArgMemOnly))
-
-// void swift_asyncLet_end(AsyncLet *alet);
-FUNCTION(EndAsyncLet,
-         swift_asyncLet_end, SwiftCC,
-         ConcurrencyAvailability,
-         RETURNS(VoidTy),
-         ARGS(SwiftAsyncLetPtrTy),
-         ATTRS(NoUnwind))
-
 // void swift_taskGroup_initialize(TaskGroup *group);
 FUNCTION(TaskGroupInitialize,
          swift_taskGroup_initialize, SwiftCC,