wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[LLDB][MIPS] Fix TestWatchpointIter failure 

Reviewers: jingham

Subscribers: jaydeep, bhushan, slthakur, lldb-commits

Differential Revision: https://reviews.llvm.org/D27124

llvm-svn: 289211
This commit is contained in:
Nitesh Jain 2016-12-09 13:54:47 +00:00
parent e51a967d89
commit 0546e845c0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lldb/source/Target/StopInfo.cpp
View File

@ -692,7 +692,13 @@ protected:
if (process_sp->GetWatchpointSupportInfo(num, wp_triggers_after) if (process_sp->GetWatchpointSupportInfo(num, wp_triggers_after)
.Success()) { .Success()) {
if (!wp_triggers_after) { if (!wp_triggers_after) {
process_sp->DisableWatchpoint(wp_sp.get(), false); // We need to preserve the watch_index before watchpoint
// is disable. Since Watchpoint::SetEnabled will clear the
// watch index.
// This will fix TestWatchpointIter failure
Watchpoint *wp = wp_sp.get();
uint32_t watch_index = wp->GetHardwareIndex();
process_sp->DisableWatchpoint(wp, false);
StopInfoSP stored_stop_info_sp = thread_sp->GetStopInfo(); StopInfoSP stored_stop_info_sp = thread_sp->GetStopInfo();
assert(stored_stop_info_sp.get() == this); assert(stored_stop_info_sp.get() == this);
@ -710,7 +716,8 @@ protected:
process_sp->GetThreadList().SetSelectedThreadByID( process_sp->GetThreadList().SetSelectedThreadByID(
thread_sp->GetID()); thread_sp->GetID());
thread_sp->SetStopInfo(stored_stop_info_sp); thread_sp->SetStopInfo(stored_stop_info_sp);
process_sp->EnableWatchpoint(wp_sp.get(), false); process_sp->EnableWatchpoint(wp, false);
wp->SetHardwareIndex(watch_index);
} }
} }
} }