Skip to content

Commit 08c9172

Browse files
committed
small CR fixes
1 parent 7d45343 commit 08c9172

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

lldb/tools/lldb-dap/Handler/DisassembleRequestHandler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ DisassembleRequestHandler::Run(const DisassembleArguments &args) const {
6363
return llvm::make_error<DAPError>(
6464
"Failed to find instructions for memory address.");
6565

66-
const bool resolveSymbols = args.resolveSymbols.value_or(false);
66+
const bool resolve_symbols = args.resolveSymbols.value_or(false);
6767
const auto num_insts = insts.GetSize();
6868
for (size_t i = 0; i < num_insts; ++i) {
6969
lldb::SBInstruction inst = insts.GetInstructionAtIndex(i);
@@ -103,7 +103,7 @@ DisassembleRequestHandler::Run(const DisassembleArguments &args) const {
103103
: symbol.GetName())
104104
<< ": ";
105105

106-
if (resolveSymbols)
106+
if (resolve_symbols)
107107
disassembled_inst.symbol = symbol.GetDisplayName();
108108
}
109109

lldb/tools/lldb-dap/Protocol/ProtocolRequests.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,12 +753,15 @@ struct DisassembleArguments {
753753
};
754754
bool fromJSON(const llvm::json::Value &, DisassembleArguments &,
755755
llvm::json::Path);
756+
llvm::json::Value toJSON(const DisassembleArguments &);
756757

757758
/// Response to `disassemble` request.
758759
struct DisassembleResponseBody {
759760
/// The list of disassembled instructions.
760761
std::vector<DisassembledInstruction> instructions;
761762
};
763+
bool fromJSON(const llvm::json::Value &, DisassembleResponseBody &,
764+
llvm::json::Path);
762765
llvm::json::Value toJSON(const DisassembleResponseBody &);
763766

764767
} // namespace lldb_dap::protocol

lldb/tools/lldb-dap/Protocol/ProtocolTypes.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -824,13 +824,13 @@ bool fromJSON(const llvm::json::Value &Params, DisassembledInstruction &DI,
824824
std::optional<llvm::StringRef> raw_address =
825825
Params.getAsObject()->getString("address");
826826
if (!raw_address) {
827-
P.report("missing `address` field");
827+
P.report("missing 'address' field");
828828
return false;
829829
}
830830

831831
std::optional<lldb::addr_t> address = DecodeMemoryReference(*raw_address);
832832
if (!address) {
833-
P.report("invalid `address`");
833+
P.report("invalid 'address'");
834834
return false;
835835
}
836836

0 commit comments

Comments
 (0)