[lldb-dap] Do not write over the existing error if launchCommands fail during debugger launch. #82051
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-lldb Author: John Harrison (ashgti) ChangesThis fixes an issue where the error is lost if a command while executing This should fix #82048 Full diff: https://github.com/llvm/llvm-project/pull/82051.diff 1 Files Affected:
diff --git a/lldb/tools/lldb-dap/lldb-dap.cpp b/lldb/tools/lldb-dap/lldb-dap.cpp
index 67022347e6d624..cc555d33b48b53 100644
--- a/lldb/tools/lldb-dap/lldb-dap.cpp
+++ b/lldb/tools/lldb-dap/lldb-dap.cpp
@@ -22,7 +22,7 @@
// We also need to #undef GetObject (which is defined to GetObjectW) because
// the JSON code we use also has methods named `GetObject()` and we conflict
// against these.
-#define NOMINMAX
+#define NOMINMAXf
#include <windows.h>
#undef GetObject
#include <io.h>
@@ -1779,8 +1779,10 @@ lldb::SBError LaunchProcess(const llvm::json::Object &request) {
// Set the launch info so that run commands can access the configured
// launch details.
g_dap.target.SetLaunchInfo(launch_info);
- if (llvm::Error err = g_dap.RunLaunchCommands(launchCommands))
+ if (llvm::Error err = g_dap.RunLaunchCommands(launchCommands)) {
error.SetErrorString(llvm::toString(std::move(err)).c_str());
+ return error;
+ }
// The custom commands might have created a new target so we should use the
// selected target after these commands are run.
g_dap.target = g_dap.debugger.GetSelectedTarget();
|
ashgti
force-pushed
the
launchCommands
branch
from
5e3787a
to
300d295
Compare
clayborg
reviewed
Feb 16, 2024
ashgti
force-pushed
the
launchCommands
branch
from
300d295
to
f76dbe1
Compare
|
✅ With the latest revision this PR passed the Python code formatter. |
ashgti
force-pushed
the
launchCommands
branch
from
f76dbe1
to
465abea
Compare
…l during debugger launch. This fixes an issue where the error is lost if a command while executing `launchCommands` when launching the debugger.
ashgti
force-pushed
the
launchCommands
branch
from
465abea
to
61224ee
Compare
Done, added tests |
clayborg
approved these changes
Feb 17, 2024
SquallATF
pushed a commit
to SquallATF/llvm-project
that referenced
this pull request
Jun 30, 2024
…l during debugger launch. (llvm#82051) This fixes an issue where the error is lost if a command while executing `launchCommands` when launching the debugger. This should fix llvm#82048
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes an issue where the error is lost if a command while executing
launchCommandswhen launching the debugger.This should fix #82048