Merge commit '38a3fc37c5f5' from swift/release/6.1 into stable/20240723

Author: git apple-llvm automerger

lldb/source/Plugins/Language/Swift/SwiftFormatters.cpp

@@ -14,7 +14,6 @@
 #include "Plugins/Language/Swift/SwiftStringIndex.h"
 #include "Plugins/LanguageRuntime/Swift/ReflectionContextInterface.h"
 #include "Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.h"
-#include "Plugins/LanguageRuntime/Swift/SwiftTask.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "lldb/DataFormatters/FormattersHelpers.h"
 #include "lldb/DataFormatters/StringPrinter.h"
@@ -24,7 +23,6 @@
 #include "lldb/Utility/LLDBLog.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/Status.h"
-#include "lldb/Utility/StreamString.h"
 #include "lldb/Utility/Timer.h"
 #include "lldb/ValueObject/ValueObject.h"
 #include "lldb/lldb-enumerations.h"

lldb/source/Plugins/LanguageRuntime/Swift/CMakeLists.txt

@@ -6,7 +6,6 @@ add_lldb_library(lldbPluginSwiftLanguageRuntime PLUGIN
   SwiftLanguageRuntimeNames.cpp
   SwiftLanguageRuntimeRemoteAST.cpp
   SwiftMetadataCache.cpp
-  SwiftTask.cpp
 
   LINK_LIBS
     swiftAST

lldb/source/Plugins/LanguageRuntime/Swift/ReflectionContext.cpp

@@ -401,8 +401,6 @@ class TargetReflectionContext : public ReflectionContextInterface {
     result.hasIsRunning = task_info.HasIsRunning;
     result.isRunning = task_info.IsRunning;
     result.isEnqueued = task_info.IsEnqueued;
-    result.id = task_info.Id;
-    result.resumeAsyncContext = task_info.ResumeAsyncContext;
     return result;
   }
 

lldb/source/Plugins/LanguageRuntime/Swift/ReflectionContextInterface.h

@@ -15,7 +15,6 @@
 
 #include <mutex>
 
-#include "lldb/lldb-defines.h"
 #include "lldb/lldb-types.h"
 #include "swift/ABI/ObjectFile.h"
 #include "swift/Remote/RemoteAddress.h"
@@ -164,8 +163,6 @@ class ReflectionContextInterface {
     bool hasIsRunning = false;
     bool isRunning = false;
     bool isEnqueued = false;
-    uint64_t id = 0;
-    lldb::addr_t resumeAsyncContext = LLDB_INVALID_ADDRESS;
   };
   // The default limits are copied from swift-inspect.
   virtual llvm::Expected<AsyncTaskInfo>

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp

@@ -16,7 +16,6 @@
 #include "SwiftMetadataCache.h"
 
 #include "Plugins/ExpressionParser/Swift/SwiftPersistentExpressionState.h"
-#include "Plugins/LanguageRuntime/Swift/SwiftTask.h"
 #include "Plugins/Process/Utility/RegisterContext_x86.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
 #include "Plugins/TypeSystem/Swift/SwiftDemangle.h"
@@ -2086,89 +2085,6 @@ class CommandObjectSwift_RefCount : public CommandObjectRaw {
   }
 };
 
-class CommandObjectLanguageSwiftTaskBacktrace final
-    : public CommandObjectParsed {
-public:
-  CommandObjectLanguageSwiftTaskBacktrace(CommandInterpreter &interpreter)
-      : CommandObjectParsed(interpreter, "backtrace",
-                            "Show the backtrace of Swift tasks. See `thread "
-                            "backtrace` for customizing backtrace output.",
-                            "language swift task backtrace <variable-name>") {
-    AddSimpleArgumentList(eArgTypeVarName);
-  }
-
-private:
-  void DoExecute(Args &command, CommandReturnObject &result) override {
-    if (!m_exe_ctx.GetFramePtr()) {
-      result.AppendError("no active frame selected");
-      return;
-    }
-
-    if (command.empty() || command[0].ref().empty()) {
-      result.AppendError("no task variable");
-      return;
-    }
-
-    StackFrame &frame = m_exe_ctx.GetFrameRef();
-    uint32_t path_options =
-        StackFrame::eExpressionPathOptionsAllowDirectIVarAccess;
-    VariableSP var_sp;
-    Status status;
-    ValueObjectSP valobj_sp = frame.GetValueForVariableExpressionPath(
-        command[0].c_str(), eDynamicDontRunTarget, path_options, var_sp,
-        status);
-    if (!valobj_sp) {
-      result.AppendError(status.AsCString());
-      return;
-    }
-
-    addr_t task_ptr = LLDB_INVALID_ADDRESS;
-    ThreadSafeReflectionContext reflection_ctx;
-    if (ValueObjectSP task_obj_sp =
-            valobj_sp->GetChildMemberWithName("_task")) {
-      task_ptr = task_obj_sp->GetValueAsUnsigned(LLDB_INVALID_ADDRESS);
-      if (task_ptr != LLDB_INVALID_ADDRESS)
-        if (auto *runtime = SwiftLanguageRuntime::Get(m_exe_ctx.GetProcessSP()))
-          reflection_ctx = runtime->GetReflectionContext();
-    }
-    if (task_ptr == LLDB_INVALID_ADDRESS || !reflection_ctx) {
-      result.AppendError("failed to access Task data from runtime");
-      return;
-    }
-
-    llvm::Expected<ReflectionContextInterface::AsyncTaskInfo> task_info =
-        reflection_ctx->asyncTaskInfo(task_ptr);
-    if (auto error = task_info.takeError()) {
-      result.AppendError(toString(std::move(error)));
-      return;
-    }
-
-    auto thread_task = ThreadTask::Create(
-        task_info->id, task_info->resumeAsyncContext, m_exe_ctx);
-    if (auto error = thread_task.takeError()) {
-      result.AppendError(toString(std::move(error)));
-      return;
-    }
-
-    // GetStatus prints the backtrace.
-    thread_task.get()->GetStatus(result.GetOutputStream(), 0, UINT32_MAX, 0,
-                                 false, true);
-    result.SetStatus(lldb::eReturnStatusSuccessFinishResult);
-  }
-};
-
-class CommandObjectLanguageSwiftTask final : public CommandObjectMultiword {
-public:
-  CommandObjectLanguageSwiftTask(CommandInterpreter &interpreter)
-      : CommandObjectMultiword(
-            interpreter, "task", "Commands for inspecting Swift Tasks.",
-            "language swift task <subcommand> [<subcommand-options>]") {
-    LoadSubCommand("backtrace",
-                   CommandObjectSP(new CommandObjectLanguageSwiftTaskBacktrace(
-                       interpreter)));
-  }
-};
-
 class CommandObjectMultiwordSwift : public CommandObjectMultiword {
 public:
   CommandObjectMultiwordSwift(CommandInterpreter &interpreter)
@@ -2180,8 +2096,6 @@ class CommandObjectMultiwordSwift : public CommandObjectMultiword {
                                    interpreter)));
     LoadSubCommand("refcount", CommandObjectSP(new CommandObjectSwift_RefCount(
                                    interpreter)));
-    LoadSubCommand("task", CommandObjectSP(new CommandObjectLanguageSwiftTask(
-                               interpreter)));
   }
 
   virtual ~CommandObjectMultiwordSwift() {}