[lldb-dap] DisassembleRequestHandler: use a better invalid instruction #141463
Conversation
This file contains hidden or 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
…n value that fits VSCode client
Member
| @llvm/pr-subscribers-lldb Author: Ely Ronnen (eronnen) ChangesDisassembleRequestHandler: use a better invalid instruction value that fits VSCode client Full diff: https://github.com/llvm/llvm-project/pull/141463.diff 2 Files Affected:
diff --git a/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp b/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp index c9061ef19f17a..1d110eac18126 100644 --- a/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp +++ b/lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp @@ -27,6 +27,7 @@ namespace lldb_dap { static protocol::DisassembledInstruction GetInvalidInstruction() { DisassembledInstruction invalid_inst; + invalid_inst.address = LLDB_INVALID_ADDRESS; invalid_inst.presentationHint = DisassembledInstruction::eDisassembledInstructionPresentationHintInvalid; return invalid_inst; diff --git a/lldb/tools/lldb-dap/Protocol/ProtocolTypes.cpp b/lldb/tools/lldb-dap/Protocol/ProtocolTypes.cpp index 8d4fbd18fee7c..2af919265b1c9 100644 --- a/lldb/tools/lldb-dap/Protocol/ProtocolTypes.cpp +++ b/lldb/tools/lldb-dap/Protocol/ProtocolTypes.cpp @@ -847,8 +847,15 @@ bool fromJSON(const llvm::json::Value &Params, DisassembledInstruction &DI, } llvm::json::Value toJSON(const DisassembledInstruction &DI) { - llvm::json::Object result{{"address", "0x" + llvm::utohexstr(DI.address)}, - {"instruction", DI.instruction}}; + llvm::json::Object result{{"instruction", DI.instruction}}; + if (DI.address == LLDB_INVALID_ADDRESS) { + // VSCode has explicit comparisons to the string "-1" in order to check for + // invalid instructions. See + // https://github.com/microsoft/vscode/blob/main/src/vs/workbench/contrib/debug/browser/disassemblyView.ts + result.insert({"address", "-1"}); + } else { + result.insert({"address", "0x" + llvm::utohexstr(DI.address)}); + } if (DI.instructionBytes) result.insert({"instructionBytes", *DI.instructionBytes}); |
ashgti approved these changes May 27, 2025
JDevlieghere approved these changes May 27, 2025
| {"instruction", DI.instruction}}; | ||
| llvm::json::Object result{{"instruction", DI.instruction}}; | ||
| if (DI.address == LLDB_INVALID_ADDRESS) { | ||
| // VSCode has explicit comparisons to the string "-1" in order to check for |
Member
There was a problem hiding this comment.
Nit: VS Code not VSCode.
Suggested change
| // VSCode has explicit comparisons to the string "-1" in order to check for | |
| // VS Code has explicit comparisons to the string "-1" in order to check for |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants
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.
DisassembleRequestHandler: use a better invalid instruction value that fits VSCode client