llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: Jason Molenda (jasonmolenda) <details> <summary>Changes</summary> I originally thought to try to guesstimate the hardware watchpoint index number that a Resource was associated with, but gdb remote serial protocol doesn't give us the hardware register index used so it was only a guess. I changed my mind and simply use ever-incrementing ID numbers for the WatchpointResources, but forgot to remove the SetID method. --- Full diff: https://github.com/llvm/llvm-project/pull/79389.diff 2 Files Affected: - (modified) lldb/include/lldb/Breakpoint/WatchpointResource.h (-8) - (modified) lldb/source/Breakpoint/WatchpointResource.cpp (-2) ``````````diff diff --git a/lldb/include/lldb/Breakpoint/WatchpointResource.h b/lldb/include/lldb/Breakpoint/WatchpointResource.h index 4b1d733850f1bbf..070d84cff8f26fe 100644 --- a/lldb/include/lldb/Breakpoint/WatchpointResource.h +++ b/lldb/include/lldb/Breakpoint/WatchpointResource.h @@ -121,14 +121,6 @@ class WatchpointResource /// A copy of the Watchpoints which own this resource. WatchpointCollection CopyConstituentsList(); - // The ID of the WatchpointResource is set by the WatchpointResourceList - // when the Resource has been set in the inferior and is being added - // to the List, in an attempt to match the hardware watchpoint register - // ordering. If a Process can correctly identify the hardware watchpoint - // register index when it has created the Resource, it may initialize it - // before it is inserted in the WatchpointResourceList. - void SetID(lldb::wp_resource_id_t); - lldb::wp_resource_id_t GetID() const; bool Contains(lldb::addr_t addr); diff --git a/lldb/source/Breakpoint/WatchpointResource.cpp b/lldb/source/Breakpoint/WatchpointResource.cpp index d0f8dc346f3c024..c1eb50c0358b30e 100644 --- a/lldb/source/Breakpoint/WatchpointResource.cpp +++ b/lldb/source/Breakpoint/WatchpointResource.cpp @@ -42,8 +42,6 @@ void WatchpointResource::SetType(bool read, bool write) { wp_resource_id_t WatchpointResource::GetID() const { return m_id; } -void WatchpointResource::SetID(wp_resource_id_t id) { m_id = id; } - bool WatchpointResource::Contains(addr_t addr) { if (addr >= m_addr && addr < m_addr + m_size) return true; `````````` </details> https://github.com/llvm/llvm-project/pull/79389 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits