llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Ebuka Ezike (da-viper) <details> <summary>Changes</summary> It crashes because the event_thread and progress_event_thread not joined before calling `DAP` struct deconstructor. It now joins when we leave the `DAP::Loop` function. from [Discourse](https://discourse.llvm.org/t/is-lldb-dap-usable/87320) --- Full diff: https://github.com/llvm/llvm-project/pull/148878.diff 2 Files Affected: - (modified) lldb/tools/lldb-dap/DAP.cpp (+12) - (modified) lldb/tools/lldb-dap/lldb-dap.cpp (-9) ``````````diff diff --git a/lldb/tools/lldb-dap/DAP.cpp b/lldb/tools/lldb-dap/DAP.cpp index a67abe582abd4..134ddaa4c8f59 100644 --- a/lldb/tools/lldb-dap/DAP.cpp +++ b/lldb/tools/lldb-dap/DAP.cpp @@ -22,6 +22,7 @@ #include "lldb/lldb-defines.h" #include "lldb/lldb-enumerations.h" #include "llvm/ADT/ArrayRef.h" +#include "llvm/ADT/ScopeExit.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/Twine.h" #include "llvm/Support/Error.h" @@ -224,6 +225,16 @@ llvm::Error DAP::ConfigureIO(std::FILE *overrideOut, std::FILE *overrideErr) { void DAP::StopIO() { out.Stop(); err.Stop(); + + if (event_thread.joinable()) { + broadcaster.BroadcastEventByType(eBroadcastBitStopEventThread); + event_thread.join(); + } + + if (progress_event_thread.joinable()) { + broadcaster.BroadcastEventByType(eBroadcastBitStopProgressThread); + progress_event_thread.join(); + } } // Send the JSON in "json_str" to the "out" stream. Correctly send the @@ -794,6 +805,7 @@ bool DAP::HandleObject(const llvm::json::Object &object) { } llvm::Error DAP::Loop() { + auto stop_io = llvm::make_scope_exit([this]() { StopIO(); }); while (!disconnecting) { llvm::json::Object object; lldb_dap::PacketStatus status = GetNextObject(object); diff --git a/lldb/tools/lldb-dap/lldb-dap.cpp b/lldb/tools/lldb-dap/lldb-dap.cpp index 9e0e7f21ce4fc..02688fc858f6b 100644 --- a/lldb/tools/lldb-dap/lldb-dap.cpp +++ b/lldb/tools/lldb-dap/lldb-dap.cpp @@ -1096,15 +1096,6 @@ void request_disconnect(DAP &dap, const llvm::json::Object &request) { } SendTerminatedEvent(dap); dap.SendJSON(llvm::json::Value(std::move(response))); - if (dap.event_thread.joinable()) { - dap.broadcaster.BroadcastEventByType(eBroadcastBitStopEventThread); - dap.event_thread.join(); - } - if (dap.progress_event_thread.joinable()) { - dap.broadcaster.BroadcastEventByType(eBroadcastBitStopProgressThread); - dap.progress_event_thread.join(); - } - dap.StopIO(); dap.disconnecting = true; } `````````` </details> https://github.com/llvm/llvm-project/pull/148878 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
