commit 4fe2302ae218217e52563d3f78183283960cd4bb
author Johnny Chen <johnny.chen@apple.com> Tue Aug 21 23:17:04 2012 +0000
committer Johnny Chen <johnny.chen@apple.com> Tue Aug 21 23:17:04 2012 +0000
tree 9b5d581f5104a9633165d105eb4fbf755af1f01c
parent bbdd46789554fc9ab4e348f69ee5b95d1347bd58

Fix test failures in TestWatchpointIter.py due to http://llvm.org/viewvc/llvm-project?rev=162322&view=rev.

llvm-svn: 162328

lldb/source/Target/StopInfo.cpp

diff --git a/lldb/source/Target/StopInfo.cpp b/lldb/source/Target/StopInfo.cpp
index 2d48dcc..400829f 100644
--- a/lldb/source/Target/StopInfo.cpp
+++ b/lldb/source/Target/StopInfo.cpp
@@ -454,12 +454,18 @@
             watchpoint(w)
         {
             if (process && watchpoint)
+            {
+                watchpoint->TurnOnEphemeralMode();
                 process->DisableWatchpoint(watchpoint);
+            }
         }
         ~WatchpointSentry()
         {
             if (process && watchpoint)
+            {
                 process->EnableWatchpoint(watchpoint);
+                watchpoint->TurnOffEphemeralMode();
+            }
         }
     private:
         Process *process;