shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lldb-dap] Correct the disconnect helper on server shutdown. (#142508)

Browse Source 
Previously, we incorrectly handled the disconnect operation if we signal
lldb-dap running in server mode.

Updated to correctly disconnect the attach vs launch behavior on server
shutdown.
This commit is contained in:
John Harrison 2025-06-03 09:40:40 -07:00 committed by GitHub
parent 20ca895860
commit 4d42c8e184
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/test/API/tools/lldb-dap/server/TestDAP_server.py
View File

@ -102,7 +102,7 @@ class TestDAP_server(lldbdap_testcase.DAPTestCaseBase):
process.send_signal(signal.SIGINT)
self.dap_server.wait_for_terminated()
self.assertIsNone(
self.assertIsNotNone(
self.dap_server.exit_status,
"Process exited before interrupting lldb-dap server",
)

2
lldb/tools/lldb-dap/DAP.cpp
View File

@ -820,7 +820,7 @@ void DAP::SendTerminatedEvent() {
});
}
llvm::Error DAP::Disconnect() { return Disconnect(is_attach); }
llvm::Error DAP::Disconnect() { return Disconnect(!is_attach); }
llvm::Error DAP::Disconnect(bool terminateDebuggee) {
lldb::SBError error;

2
lldb/tools/lldb-dap/Handler/DisconnectRequestHandler.cpp
View File

@ -20,7 +20,7 @@ namespace lldb_dap {
/// Disconnect request; value of command field is 'disconnect'.
Error DisconnectRequestHandler::Run(
const std::optional<DisconnectArguments> &arguments) const {
bool terminateDebuggee = dap.is_attach ? false : true;
bool terminateDebuggee = !dap.is_attach;
if (arguments && arguments->terminateDebuggee)
terminateDebuggee = *arguments->terminateDebuggee;