Revert "[lldb] Add 'modify' type watchpoints, make it default (#66308)"

TestStepOverWatchpoint.py and TestUnalignedWatchpoint.py are failing
on the ubuntu and debian bots
https://lab.llvm.org/buildbot/#/builders/68/builds/60204
https://lab.llvm.org/buildbot/#/builders/96/builds/45623

and the newly added test TestModifyWatchpoint.py does not
work on windows bot
https://lab.llvm.org/buildbot/#/builders/219/builds/5708

I will debug tomorrow morning and reland.

This reverts commit 3692267ca8f9c51cb55e4387283762d921fe2ae2.

2 files changed, 9 insertions, 16 deletions

diff --git a/lldb/test/API/python_api/default-constructor/sb_target.py b/lldb/test/API/python_api/default-constructor/sb_target.py
index 1acf102..2ba72d39 100644
--- a/lldb/test/API/python_api/default-constructor/sb_target.py
+++ b/lldb/test/API/python_api/default-constructor/sb_target.py
@@ -53,10 +53,7 @@ def fuzz_obj(obj):
     obj.GetByteOrder()
     obj.GetTriple()
     error = lldb.SBError()
-    wp_opts = lldb.SBWatchpointOptions()
-    wp_opts.SetWatchpointTypeRead(True)
-    wp_opts.SetWatchpointTypeWrite(lldb.eWatchpointWriteTypeOnModify)
-    obj.WatchpointCreateByAddress(123, 8, wp_opts, error)
+    obj.WatchAddress(123, 8, True, True, error)
     obj.GetBroadcaster()
     obj.GetDescription(lldb.SBStream(), lldb.eDescriptionLevelBrief)
     obj.Clear()
diff --git a/lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py b/lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
index bf31819..79124b3 100644
--- a/lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
+++ b/lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
@@ -1,5 +1,5 @@
 """
-Use lldb Python SBtarget.WatchpointCreateByAddress() API to create a watchpoint for write of '*g_char_ptr'.
+Use lldb Python SBtarget.WatchAddress() API to create a watchpoint for write of '*g_char_ptr'.
 """
 
 import lldb
@@ -8,7 +8,7 @@ from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 
-class TargetWatchpointCreateByAddressPITestCase(TestBase):
+class TargetWatchAddressAPITestCase(TestBase):
     NO_DEBUG_INFO_TESTCASE = True
 
     def setUp(self):
@@ -22,7 +22,7 @@ class TargetWatchpointCreateByAddressPITestCase(TestBase):
         self.violating_func = "do_bad_thing_with_location"
 
     def test_watch_address(self):
-        """Exercise SBTarget.WatchpointCreateByAddress() API to set a watchpoint."""
+        """Exercise SBTarget.WatchAddress() API to set a watchpoint."""
         self.build()
         exe = self.getBuildArtifact("a.out")
 
@@ -51,10 +51,8 @@ class TargetWatchpointCreateByAddressPITestCase(TestBase):
         )
         # Watch for write to *g_char_ptr.
         error = lldb.SBError()
-        wp_opts = lldb.SBWatchpointOptions()
-        wp_opts.SetWatchpointTypeWrite(lldb.eWatchpointWriteTypeOnModify)
-        watchpoint = target.WatchpointCreateByAddress(
-            value.GetValueAsUnsigned(), 1, wp_opts, error
+        watchpoint = target.WatchAddress(
+            value.GetValueAsUnsigned(), 1, False, True, error
         )
         self.assertTrue(
             value and watchpoint, "Successfully found the pointer and set a watchpoint"
@@ -92,7 +90,7 @@ class TargetWatchpointCreateByAddressPITestCase(TestBase):
     @skipIf(archs=["mips", "mipsel", "mips64", "mips64el"])
     @skipIf(archs=["s390x"])  # Likewise on SystemZ
     def test_watch_address_with_invalid_watch_size(self):
-        """Exercise SBTarget.WatchpointCreateByAddress() API but pass an invalid watch_size."""
+        """Exercise SBTarget.WatchAddress() API but pass an invalid watch_size."""
         self.build()
         exe = self.getBuildArtifact("a.out")
 
@@ -126,10 +124,8 @@ class TargetWatchpointCreateByAddressPITestCase(TestBase):
         if self.getArchitecture() not in ["arm64", "arm64e", "arm64_32"]:
             # Watch for write to *g_char_ptr.
             error = lldb.SBError()
-            wp_opts = lldb.SBWatchpointOptions()
-            wp_opts.SetWatchpointTypeWrite(lldb.eWatchpointWriteTypeOnModify)
-            watchpoint = target.WatchpointCreateByAddress(
-                value.GetValueAsUnsigned(), 365, wp_opts, error
+            watchpoint = target.WatchAddress(
+                value.GetValueAsUnsigned(), 365, False, True, error
             )
             self.assertFalse(watchpoint)
             self.expect(