Skip to content

Commit 369c773

Browse files
committed
Revert "[lldb][debugserver] Fix an off-by-one error in watchpoint identification (#134314)"
This reverts commit 21d9121. Failure on the aarch64 ubuntu bot when setting the 4th watchpoint; may be a hardware limitation on that bot. I thought creating four watchpoints would be generally safe, but I don't need to do that for my test, will re-land without it.
1 parent 21d9121 commit 369c773

File tree

4 files changed

+1
-113
lines changed

4 files changed

+1
-113
lines changed

lldb/test/API/functionalities/watchpoint/consecutive-watchpoints/Makefile

Lines changed: 0 additions & 3 deletions
This file was deleted.

lldb/test/API/functionalities/watchpoint/consecutive-watchpoints/TestConsecutiveWatchpoints.py

Lines changed: 0 additions & 87 deletions
This file was deleted.

lldb/test/API/functionalities/watchpoint/consecutive-watchpoints/main.c

Lines changed: 0 additions & 22 deletions
This file was deleted.

lldb/tools/debugserver/source/DNBBreakpoint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ DNBBreakpointList::FindNearestWatchpoint(nub_addr_t addr) const {
9898
if (pos.second.IsEnabled()) {
9999
nub_addr_t start_addr = pos.second.Address();
100100
nub_addr_t end_addr = start_addr + pos.second.ByteSize();
101-
if (addr >= start_addr && addr < end_addr)
101+
if (addr >= start_addr && addr <= end_addr)
102102
return &pos.second;
103103
}
104104
}

0 commit comments

Comments
 (0)