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

5 files changed, 14 insertions, 14 deletions

diff --git a/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py b/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
index 2340a6130a7..f5f9aef0014 100644
--- a/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
+++ b/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
@@ -350,14 +350,14 @@ class APIDefaultConstructorTestCase(TestBase):
         sb_valuelist.fuzz_obj(obj)
 
     @python_api_test
-    def test_SBWatchpointLocation(self):
-        obj = lldb.SBWatchpointLocation()
+    def test_SBWatchpoint(self):
+        obj = lldb.SBWatchpoint()
         if self.TraceOn():
             print obj
         self.assertFalse(obj)
         # Do fuzz testing on the invalid obj, it should not crash lldb.
-        import sb_watchpointlocation
-        sb_watchpointlocation.fuzz_obj(obj)
+        import sb_watchpoint
+        sb_watchpoint.fuzz_obj(obj)
 
 
 if __name__ == '__main__':
diff --git a/lldb/test/python_api/default-constructor/sb_frame.py b/lldb/test/python_api/default-constructor/sb_frame.py
index db0e82d4307..41edaff02ed 100644
--- a/lldb/test/python_api/default-constructor/sb_frame.py
+++ b/lldb/test/python_api/default-constructor/sb_frame.py
@@ -33,6 +33,5 @@ def fuzz_obj(obj):
     obj.FindVariable("my_var", lldb.eDynamicCanRunTarget)
     obj.FindValue("your_var", lldb.eValueTypeVariableGlobal)
     obj.FindValue("your_var", lldb.eValueTypeVariableStatic, lldb.eDynamicCanRunTarget)
-    obj.WatchValue("global_var", lldb.eValueTypeVariableGlobal, lldb.LLDB_WATCH_TYPE_READ)
     obj.GetDescription(lldb.SBStream())
     obj.Clear()
diff --git a/lldb/test/python_api/default-constructor/sb_target.py b/lldb/test/python_api/default-constructor/sb_target.py
index 6b7bf777a06..3f15a1a0565 100644
--- a/lldb/test/python_api/default-constructor/sb_target.py
+++ b/lldb/test/python_api/default-constructor/sb_target.py
@@ -40,14 +40,13 @@ def fuzz_obj(obj):
     obj.EnableAllBreakpoints()
     obj.DisableAllBreakpoints()
     obj.DeleteAllBreakpoints()
-    obj.GetNumWatchpointLocations()
-    obj.GetLastCreatedWatchpointLocation()
-    obj.GetWatchpointLocationAtIndex(0)
-    obj.WatchpointLocationDelete(0)
-    obj.FindWatchpointLocationByID(0)
-    obj.EnableAllWatchpointLocations()
-    obj.DisableAllWatchpointLocations()
-    obj.DeleteAllWatchpointLocations()
+    obj.GetNumWatchpoints()
+    obj.GetWatchpointAtIndex(0)
+    obj.DeleteWatchpoint(0)
+    obj.FindWatchpointByID(0)
+    obj.EnableAllWatchpoints()
+    obj.DisableAllWatchpoints()
+    obj.DeleteAllWatchpoints()
     obj.GetBroadcaster()
     obj.GetDescription(lldb.SBStream(), lldb.eDescriptionLevelBrief)
     obj.Clear()
@@ -55,5 +54,5 @@ def fuzz_obj(obj):
         print module
     for bp in obj.breakpoint_iter():
         print bp
-    for wp_loc in obj.watchpoint_location_iter():
+    for wp_loc in obj.watchpoint_iter():
         print wp_loc
diff --git a/lldb/test/python_api/default-constructor/sb_value.py b/lldb/test/python_api/default-constructor/sb_value.py
index 715ba1ce493..b3a26def772 100644
--- a/lldb/test/python_api/default-constructor/sb_value.py
+++ b/lldb/test/python_api/default-constructor/sb_value.py
@@ -33,5 +33,7 @@ def fuzz_obj(obj):
     obj.GetDescription(stream)
     obj.GetExpressionPath(stream)
     obj.GetExpressionPath(stream, True)
+    obj.Watch(True, True, False)
+    obj.WatchPointee(True, False, True)
     for child_val in obj:
         print child_val
diff --git a/lldb/test/python_api/default-constructor/sb_watchpointlocation.py b/lldb/test/python_api/default-constructor/sb_watchpoint.py
index 8b0b1ecc481..8b0b1ecc481 100644
--- a/lldb/test/python_api/default-constructor/sb_watchpointlocation.py
+++ b/lldb/test/python_api/default-constructor/sb_watchpoint.py