[Lldb-commits] [lldb] d8ec70d - [lldb][debugserver] Fix bugs in FindBreakpointsThatOverlapRange (#217837)
via lldb-commits
lldb-commits at lists.llvm.org
Mon Aug 24 01:26:25 PDT 2026
Author: David Spickett
Date: 2026-08-24T09:26:21+01:00
New Revision: d8ec70dc8db9b55d3185970be56efdf7066d89fe
URL: https://github.com/llvm/llvm-project/commit/d8ec70dc8db9b55d3185970be56efdf7066d89fe
DIFF: https://github.com/llvm/llvm-project/commit/d8ec70dc8db9b55d3185970be56efdf7066d89fe.diff
LOG: [lldb][debugserver] Fix bugs in FindBreakpointsThatOverlapRange (#217837)
Fixes #217359
The first issue is obvious, when checking the previous breakpoint we
should push back prev_pos->second, instead of pos->second.
The second problem is what happens when lower_bound returns end().
Before, `if (pos != end)` would stop us checking the previous
breakpoint.
If lower_bound returned end() but there were breakpoints, the last
breakpoint may start before addr and extend past it. This was being
missed.
To fix that:
* Remove the `if (pos != end)` check.
* Return early if there are no breakpoints.
* If lower_bound does not find the first one, look at the previous one.
* Look at the rest from pos onwards.
The earlly return means we know that
m_breakpoints.begin() != m_breakpoints.end() and so even if lower_bound
returns end(), we are safe to decrement that iterator.
I think this will fix the API tests in #217348, when those are enabled
from debugserver.
Added:
Modified:
lldb/tools/debugserver/source/DNBBreakpoint.cpp
Removed:
################################################################################
diff --git a/lldb/tools/debugserver/source/DNBBreakpoint.cpp b/lldb/tools/debugserver/source/DNBBreakpoint.cpp
index 531a049bfd803..ce390a85f54e0 100644
--- a/lldb/tools/debugserver/source/DNBBreakpoint.cpp
+++ b/lldb/tools/debugserver/source/DNBBreakpoint.cpp
@@ -125,34 +125,38 @@ DNBBreakpointList::FindNearestWatchpoint(nub_addr_t addr) const {
size_t DNBBreakpointList::FindBreakpointsThatOverlapRange(
nub_addr_t addr, nub_addr_t size, std::vector<DNBBreakpoint *> &bps) {
bps.clear();
+
+ if (m_breakpoints.empty())
+ return bps.size();
+
iterator end = m_breakpoints.end();
// Find the first breakpoint with an address >= to "addr"
iterator pos = m_breakpoints.lower_bound(addr);
- if (pos != end) {
- if (pos != m_breakpoints.begin()) {
- // Watch out for a breakpoint at an address less than "addr" that might
- // still overlap
- iterator prev_pos = pos;
- --prev_pos;
- if (prev_pos->second.IntersectsRange(addr, size, NULL, NULL, NULL))
- bps.push_back(&pos->second);
- }
- while (pos != end) {
- // When we hit a breakpoint whose start address is greater than "addr +
- // size" we are done.
- // Do the math in a way that doesn't risk unsigned overflow with bad
- // input.
- if ((pos->second.Address() - addr) >= size)
- break;
+ if (pos != m_breakpoints.begin()) {
+ // Watch out for a breakpoint at an address less than "addr" that might
+ // still overlap
+ iterator prev_pos = pos;
+ --prev_pos;
+ if (prev_pos->second.IntersectsRange(addr, size, NULL, NULL, NULL))
+ bps.push_back(&prev_pos->second);
+ }
+
+ while (pos != end) {
+ // When we hit a breakpoint whose start address is greater than "addr +
+ // size" we are done.
+ // Do the math in a way that doesn't risk unsigned overflow with bad
+ // input.
+ if ((pos->second.Address() - addr) >= size)
+ break;
- // Check if this breakpoint overlaps, and if it does, add it to the list
- if (pos->second.IntersectsRange(addr, size, NULL, NULL, NULL))
- bps.push_back(&pos->second);
+ // Check if this breakpoint overlaps, and if it does, add it to the list
+ if (pos->second.IntersectsRange(addr, size, NULL, NULL, NULL))
+ bps.push_back(&pos->second);
- ++pos;
- }
+ ++pos;
}
+
return bps.size();
}
More information about the lldb-commits
mailing list