Revert "Merge pull request #77609 from ktoso/wip-task-names" (#79562)

This reverts commit 4ab5d26.

Author: ktoso

Runtimes/Core/Concurrency/CMakeLists.txt

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

include/swift/ABI/MetadataValues.h

@@ -2730,7 +2730,6 @@ class JobFlags : public FlagSet<uint32_t> {
     // 27 is currently unused
     Task_IsAsyncLetTask                   = 28,
     Task_HasInitialTaskExecutorPreference = 29,
-    Task_HasInitialTaskName               = 30,
   };
   // clang-format on
 
@@ -2767,9 +2766,6 @@ class JobFlags : public FlagSet<uint32_t> {
   FLAGSET_DEFINE_FLAG_ACCESSORS(Task_HasInitialTaskExecutorPreference,
                                 task_hasInitialTaskExecutorPreference,
                                 task_setHasInitialTaskExecutorPreference)
-  FLAGSET_DEFINE_FLAG_ACCESSORS(Task_HasInitialTaskName,
-                                task_hasInitialTaskName,
-                                task_setHasInitialTaskName)
 };
 
 /// Kinds of task status record.
@@ -2799,9 +2795,6 @@ enum class TaskStatusRecordKind : uint8_t {
   /// enqueued on.
   TaskExecutorPreference = 5,
 
-  /// A human-readable task name.
-  TaskName = 6,
-
   // Kinds >= 192 are private to the implementation.
   First_Reserved = 192,
   Private_RecordLock = 192
@@ -2825,8 +2818,6 @@ enum class TaskOptionRecordKind : uint8_t {
   /// Set the initial task executor preference of the task.
   InitialTaskExecutorUnowned = 5,
   InitialTaskExecutorOwned = 6,
-  // Set a human-readable task name.
-  InitialTaskName = 7,
   /// Request a child task for swift_task_run_inline.
   RunInline = UINT8_MAX,
 };

include/swift/ABI/Task.h

@@ -421,28 +421,6 @@ class AsyncTask : public Job {
   /// Checking this is, of course, inherently race-prone on its own.
   bool isCancelled() const;
 
-  // ==== INITIAL TASK RECORDS =================================================
-  // A task may have a number of "initial" records set, they MUST be set in the
-  // following order to make the task-local allocation/deallocation's stack
-  // discipline easy to work out at the tasks destruction:
-  //
-  // - Initial TaskName
-  // - Initial ExecutorPreference
-
-  // ==== Task Naming ----------------------------------------------------------
-
-  /// At task creation a task may be assigned a name.
-  void pushInitialTaskName(const char* taskName);
-  void dropInitialTaskNameRecord();
-
-  /// Get the initial task name that was given to this task during creation,
-  /// or nullptr if the task has no name
-  const char* getTaskName();
-
-  bool hasInitialTaskNameRecord() const {
-    return Flags.task_hasInitialTaskName();
-  }
-
   // ==== Task Executor Preference ---------------------------------------------
 
   /// Get the preferred task executor reference if there is one set for this

include/swift/ABI/TaskOptions.h

@@ -131,26 +131,6 @@ class InitialTaskExecutorOwnedPreferenceTaskOptionRecord
   }
 };
 
-class InitialTaskNameTaskOptionRecord
-    : public TaskOptionRecord {
-
-  const char* TaskName;
-
-public:
-  InitialTaskNameTaskOptionRecord(
-      const char* taskName)
-      : TaskOptionRecord(TaskOptionRecordKind::InitialTaskName),
-        TaskName(taskName) {}
-
-  const char* getTaskName() const {
-    return TaskName;
-  }
-
-  static bool classof(const TaskOptionRecord *record) {
-    return record->getKind() == TaskOptionRecordKind::InitialTaskName;
-  }
-};
-
 /// Task option to specify the initial serial executor for the task.
 class InitialSerialExecutorTaskOptionRecord : public TaskOptionRecord {
   const SerialExecutorRef Executor;

include/swift/ABI/TaskStatus.h

@@ -325,22 +325,6 @@ class TaskExecutorPreferenceStatusRecord : public TaskStatusRecord {
   }
 };
 
-class TaskNameStatusRecord : public TaskStatusRecord {
-private:
-  const char *Name;
-
-public:
-  TaskNameStatusRecord(const char *name)
-      : TaskStatusRecord(TaskStatusRecordKind::TaskName),
-        Name(name) {}
-
-  const char *getName() { return Name; }
-
-  static bool classof(const TaskStatusRecord *record) {
-    return record->getKind() == TaskStatusRecordKind::TaskName;
-  }
-};
-
 // This record is allocated for a task to record what it is dependent on before
 // the task can make progress again.
 class TaskDependencyStatusRecord : public TaskStatusRecord {

include/swift/AST/ASTSynthesis.h

@@ -57,7 +57,6 @@ enum SingletonTypeSynthesizer {
   _taskExecutor,   // the '_Concurrency.TaskExecutor' protocol
   _actor,          // the '_Concurrency.Actor' protocol
   _distributedActor,  // the 'Distributed.DistributedActor' protocol
-  _unsafeRawBufferPointer // UnsafeRawBufferPointer
 };
 inline Type synthesizeType(SynthesisContext &SC,
                            SingletonTypeSynthesizer kind) {
@@ -90,8 +89,6 @@ inline Type synthesizeType(SynthesisContext &SC,
   case _distributedActor:
     return SC.Context.getProtocol(KnownProtocolKind::DistributedActor)
       ->getDeclaredInterfaceType();
-  case _unsafeRawBufferPointer:
-    return SC.Context.getUnsafeRawBufferPointerType();
   case _copyable:
     return SC.Context.getProtocol(KnownProtocolKind::Copyable)
         ->getDeclaredInterfaceType();

include/swift/AST/Builtins.def

@@ -954,8 +954,7 @@ BUILTIN_MISC_OPERATION(UnprotectedAddressOfBorrowOpaque, "unprotectedAddressOfBo
 /// createTask<T>(flags: Int,
 ///               initialSerialExecutor: (Builtin.Executor)? = nil,
 ///               taskGroup: Builtin.RawPointer? = nil,
-///               initialTaskExecutorDeprecated: (Builtin.Executor)? = nil,
-///               initialTaskExecutorOwned: (any TaskExecutor)? = nil,
+///               initialTaskExecutor: (Builtin.Executor)? = nil,
 ///               operation: sending @escaping () async throws -> T)
 ///  -> Builtin.NativeObject, Builtin.RawPointer)
 ///

include/swift/Basic/Features.def

@@ -151,7 +151,6 @@ BASELINE_LANGUAGE_FEATURE(BuiltinBuildExecutor, 0, "Executor-building builtins")
 BASELINE_LANGUAGE_FEATURE(BuiltinBuildComplexEqualityExecutor, 0, "Executor-building for 'complexEquality executor' builtins")
 BASELINE_LANGUAGE_FEATURE(BuiltinBuildMainExecutor, 0, "MainActor executor building builtin")
 BASELINE_LANGUAGE_FEATURE(BuiltinCreateAsyncTaskOwnedTaskExecutor, 0, "Task create with owned TaskExecutor")
-BASELINE_LANGUAGE_FEATURE(BuiltinCreateAsyncTaskName, 0, "Task create with a name")
 BASELINE_LANGUAGE_FEATURE(BuiltinCreateAsyncTaskInGroup, 0, "Task create in task group builtin with extra flags")
 BASELINE_LANGUAGE_FEATURE(BuiltinCreateAsyncTaskInGroupWithExecutor, 0, "Task create in task group builtin with extra flags")
 BASELINE_LANGUAGE_FEATURE(BuiltinCreateAsyncDiscardingTaskInGroup, 0, "Task create in discarding task group builtin, accounting for the Void return type")

include/swift/Runtime/Concurrency.h

@@ -1022,9 +1022,6 @@ void swift_task_reportUnexpectedExecutor(
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 JobPriority swift_task_getCurrentThreadPriority(void);
 
-SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
-const char *swift_task_getCurrentTaskName(void);
-
 SWIFT_EXPORT_FROM(swift_Concurrency) SWIFT_CC(swift)
 void swift_task_startOnMainActor(AsyncTask* job);
 

lib/AST/Builtins.cpp

@@ -1573,7 +1573,6 @@ static ValueDecl *getCreateTask(ASTContext &ctx, Identifier id) {
                                 _existential(_taskExecutor),
                                 /*else*/ _executor))),
                             _nil)),
-          _label("taskName", _defaulted(_optional(_rawPointer), _nil)),
           _label("operation",
                  _sending(_function(_async(_throws(_thick)), _typeparam(0),
                                     _parameters())))),
@@ -1598,7 +1597,6 @@ static ValueDecl *getCreateDiscardingTask(ASTContext &ctx, Identifier id) {
                                 _existential(_taskExecutor),
                                 /*else*/ _executor))),
                             _nil)),
-          _label("taskName", _defaulted(_optional(_rawPointer), _nil)),
           _label("operation", _sending(_function(_async(_throws(_thick)), _void,
                                                  _parameters())))),
       _tuple(_nativeObject, _rawPointer));