Skip to content

Commit 71a817e

Browse files
committed
Some review comments
1 parent 773cff4 commit 71a817e

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ def verify_all_breakpoints_hit(self, breakpoint_ids, timeout=DEFAULT_TIMEOUT):
192192
if "hitBreakpointIds" not in body:
193193
continue
194194
hit_bps = body["hitBreakpointIds"]
195-
if all(int(breakpoint_id) in hit_bps for breakpoint_id in breakpoint_ids):
195+
if all(
196+
int(breakpoint_id) in hit_bps for breakpoint_id in breakpoint_ids
197+
):
196198
return
197199
self.assertTrue(False, f"breakpoints not hit, stopped_events={stopped_events}")
198200

lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ def test_hit_multiple_breakpoints(self):
405405
all appear in the stop reason."""
406406
breakpoint_lines = [
407407
line_number("main.cpp", "// end of foo check"),
408-
line_number("main.cpp", "// before loop")
408+
line_number("main.cpp", "// before loop"),
409409
]
410410

411411
program = self.getBuildArtifact("a.out")

lldb/tools/lldb-dap/JSONUtils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -654,13 +654,13 @@ llvm::json::Value CreateThreadStopped(DAP &dap, lldb::SBThread &thread,
654654
} else {
655655
body.try_emplace("reason", "breakpoint");
656656
}
657-
std::vector<llvm::json::Value> bp_ids;
657+
std::vector<lldb::break_id_t> bp_ids;
658658
std::ostringstream desc_sstream;
659659
desc_sstream << "breakpoint";
660660
for (size_t idx = 0; idx < thread.GetStopReasonDataCount(); idx += 2) {
661661
lldb::break_id_t bp_id = thread.GetStopReasonDataAtIndex(idx);
662662
lldb::break_id_t bp_loc_id = thread.GetStopReasonDataAtIndex(idx + 1);
663-
bp_ids.push_back(llvm::json::Value(bp_id));
663+
bp_ids.push_back(bp_id);
664664
desc_sstream << " " << bp_id << "." << bp_loc_id;
665665
}
666666
std::string desc_str = desc_sstream.str();

0 commit comments

Comments
 (0)