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


git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@162328 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Target/StopInfo.cpp b/source/Target/StopInfo.cpp
index 2d48dcc..400829f 100644
--- a/source/Target/StopInfo.cpp
+++ b/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;