SBValue::Watch() and SBValue::WatchPointee() are now the official API for creating

a watchpoint for either the variable encapsulated by SBValue (Watch) or the pointee
encapsulated by SBValue (WatchPointee).

Removed SBFrame::WatchValue() and SBFrame::WatchLocation() API as a result of that.

Modified the watchpoint related test suite to reflect the change.

Plus replacing WatchpointLocation with Watchpoint throughout the code base.

There are still cleanups to be dome.  This patch passes the whole test suite.
Check it in so that we aggressively catch regressions.

llvm-svn: 141925

1 files changed, 10 insertions, 10 deletions

diff --git a/lldb/source/API/SBWatchpoint.cpp b/lldb/source/API/SBWatchpoint.cpp
index a921ea120f5..e3f9d8cc522 100644
--- a/lldb/source/API/SBWatchpoint.cpp
+++ b/lldb/source/API/SBWatchpoint.cpp
@@ -15,8 +15,8 @@
 
 #include "lldb/lldb-types.h"
 #include "lldb/lldb-defines.h"
-#include "lldb/Breakpoint/WatchpointLocation.h"
-#include "lldb/Breakpoint/WatchpointLocationList.h"
+#include "lldb/Breakpoint/Watchpoint.h"
+#include "lldb/Breakpoint/WatchpointList.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/Stream.h"
 #include "lldb/Core/StreamFile.h"
@@ -31,8 +31,8 @@ SBWatchpoint::SBWatchpoint () :
 {
 }
 
-SBWatchpoint::SBWatchpoint (const lldb::WatchpointLocationSP &watch_loc_sp) :
-    m_opaque_sp (watch_loc_sp)
+SBWatchpoint::SBWatchpoint (const lldb::WatchpointSP &wp_sp) :
+    m_opaque_sp (wp_sp)
 {
     LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
@@ -40,8 +40,8 @@ SBWatchpoint::SBWatchpoint (const lldb::WatchpointLocationSP &watch_loc_sp) :
     {
         SBStream sstr;
         GetDescription (sstr, lldb::eDescriptionLevelBrief);
-        log->Printf ("SBWatchpoint::SBWatchpoint (const lldb::WatchpointLocationsSP &watch_loc_sp"
-                     "=%p)  => this.sp = %p (%s)", watch_loc_sp.get(), m_opaque_sp.get(), sstr.GetData());
+        log->Printf ("SBWatchpoint::SBWatchpoint (const lldb::WatchpointSP &wp_sp"
+                     "=%p)  => this.sp = %p (%s)", wp_sp.get(), m_opaque_sp.get(), sstr.GetData());
     }
 }
 
@@ -156,7 +156,7 @@ SBWatchpoint::SetEnabled (bool enabled)
     if (m_opaque_sp)
     {
         Mutex::Locker api_locker (m_opaque_sp->GetTarget().GetAPIMutex());
-        m_opaque_sp->GetTarget().DisableWatchpointLocationByID(m_opaque_sp->GetID());
+        m_opaque_sp->GetTarget().DisableWatchpointByID(m_opaque_sp->GetID());
     }
 }
 
@@ -227,19 +227,19 @@ SBWatchpoint::GetDescription (SBStream &description, DescriptionLevel level)
     return true;
 }
 
-lldb_private::WatchpointLocation *
+lldb_private::Watchpoint *
 SBWatchpoint::operator->()
 {
     return m_opaque_sp.get();
 }
 
-lldb_private::WatchpointLocation *
+lldb_private::Watchpoint *
 SBWatchpoint::get()
 {
     return m_opaque_sp.get();
 }
 
-lldb::WatchpointLocationSP &
+lldb::WatchpointSP &
 SBWatchpoint::operator *()
 {
     return m_opaque_sp;