commit 5df85cebfb7f1d53b3d76ca4b0b9161e14a136e7
author Mohit K. Bhakkad <mohit.bhakkad@gmail.com> Fri Oct 09 15:05:45 2015 +0000
committer Mohit K. Bhakkad <mohit.bhakkad@gmail.com> Fri Oct 09 15:05:45 2015 +0000
tree 081a09e1a4be59f5e6430093287be7d0251295a3
parent 9f5013a138e16643b33c0df596002ef6b23fc9fb

[LLDB][MIPS] fix watchpoint searched on client side for same masked variables

Reviewers: clayborg, jingham.
Subscribers: jaydeep, bhushan, sagar, nitesh.jain, brucem,lldb-commits.
Differential Revision: http://reviews.llvm.org/D13548

llvm-svn: 249837

lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp

diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index 0994773..895fc05 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -2105,6 +2105,8 @@
                             watch_id_t watch_id = LLDB_INVALID_WATCH_ID;
                             if (wp_addr != LLDB_INVALID_ADDRESS)
                             {
+                                if (wp_hit_addr != LLDB_INVALID_ADDRESS)
+                                    wp_addr = wp_hit_addr;
                                 WatchpointSP wp_sp = GetTarget().GetWatchpointList().FindByAddress(wp_addr);
                                 if (wp_sp)
                                 {