Revert "[lldb] Add support for large watchpoints in lldb (#79962)"

This reverts commit 57c66b3.

Author: jasonmolenda

lldb/include/lldb/Breakpoint/WatchpointAlgorithms.h

@@ -448,32 +448,6 @@ enum WatchpointWriteType {
   eWatchpointWriteTypeOnModify
 };
 
-/// The hardware and native stub capabilities for a given target,
-/// for translating a user's watchpoint request into hardware
-/// capable watchpoint resources.
-FLAGS_ENUM(WatchpointHardwareFeature){
-    /// lldb will fall back to a default that assumes the target
-    /// can watch up to pointer-size power-of-2 regions, aligned to
-    /// power-of-2.
-    eWatchpointHardwareFeatureUnknown = (1u << 0),
-
-    /// Intel systems can watch 1, 2, 4, or 8 bytes (in 64-bit targets),
-    /// aligned naturally.
-    eWatchpointHardwareX86 = (1u << 1),
-
-    /// ARM systems with Byte Address Select watchpoints
-    /// can watch any consecutive series of bytes up to the
-    /// size of a pointer (4 or 8 bytes), at a pointer-size
-    /// alignment.
-    eWatchpointHardwareArmBAS = (1u << 2),
-
-    /// ARM systems with MASK watchpoints can watch any power-of-2
-    /// sized region from 8 bytes to 2 gigabytes, aligned to that
-    /// same power-of-2 alignment.
-    eWatchpointHardwareArmMASK = (1u << 3),
-};
-LLDB_MARK_AS_BITMASK_ENUM(WatchpointHardwareFeature)
-
 /// Programming language type.
 ///
 /// These enumerations use the same language enumerations as the DWARF

lldb/include/lldb/lldb-enumerations.h

@@ -166,12 +166,7 @@ def do_thread_actions(
 
         # Initialize the (single) watchpoint on the global variable (g_watchme)
         if num_watchpoint_threads + num_delay_watchpoint_threads > 0:
-            # The concurrent tests have multiple threads modifying a variable
-            # with the same value.  The default "modify" style watchpoint will
-            # only report this as 1 hit for all threads, because they all wrote
-            # the same value.  The testsuite needs "write" style watchpoints to
-            # get the correct number of hits reported.
-            self.runCmd("watchpoint set variable -w write g_watchme")
+            self.runCmd("watchpoint set variable g_watchme")
             for w in self.inferior_target.watchpoint_iter():
                 self.thread_watchpoint = w
                 self.assertTrue(

lldb/packages/Python/lldbsuite/test/concurrent_base.py

@@ -21,7 +21,6 @@ add_lldb_library(lldbBreakpoint NO_PLUGIN_DEPENDENCIES
   StoppointSite.cpp
   StopPointSiteList.cpp
   Watchpoint.cpp
-  WatchpointAlgorithms.cpp
   WatchpointList.cpp
   WatchpointOptions.cpp
   WatchpointResource.cpp

lldb/source/Breakpoint/CMakeLists.txt

@@ -45,16 +45,10 @@ Watchpoint::Watchpoint(Target &target, lldb::addr_t addr, uint32_t size,
       LLDB_LOG_ERROR(GetLog(LLDBLog::Watchpoints), std::move(err),
                      "Failed to set type: {0}");
     } else {
-      if (auto ts = *type_system_or_err) {
-        if (size <= target.GetArchitecture().GetAddressByteSize()) {
-          m_type =
-              ts->GetBuiltinTypeForEncodingAndBitSize(eEncodingUint, 8 * size);
-        } else {
-          CompilerType clang_uint8_type =
-              ts->GetBuiltinTypeForEncodingAndBitSize(eEncodingUint, 8);
-          m_type = clang_uint8_type.GetArrayType(size);
-        }
-      } else
+      if (auto ts = *type_system_or_err)
+        m_type =
+            ts->GetBuiltinTypeForEncodingAndBitSize(eEncodingUint, 8 * size);
+      else
         LLDB_LOG_ERROR(GetLog(LLDBLog::Watchpoints), std::move(err),
                        "Failed to set type: Typesystem is no longer live: {0}");
     }
@@ -358,20 +352,6 @@ void Watchpoint::DumpWithLevel(Stream *s,
       s->Printf("\n    declare @ '%s'", m_decl_str.c_str());
     if (!m_watch_spec_str.empty())
       s->Printf("\n    watchpoint spec = '%s'", m_watch_spec_str.c_str());
-    if (IsEnabled()) {
-      if (ProcessSP process_sp = m_target.GetProcessSP()) {
-        auto &resourcelist = process_sp->GetWatchpointResourceList();
-        size_t idx = 0;
-        s->Printf("\n    watchpoint resources:");
-        for (WatchpointResourceSP &wpres : resourcelist.Sites()) {
-          if (wpres->ConstituentsContains(this)) {
-            s->Printf("\n       #%zu: ", idx);
-            wpres->Dump(s);
-          }
-          idx++;
-        }
-      }
-    }
 
     // Dump the snapshots we have taken.
     DumpSnapshots(s, "    ");

lldb/source/Breakpoint/Watchpoint.cpp

@@ -9,7 +9,6 @@
 #include <assert.h>
 
 #include "lldb/Breakpoint/WatchpointResource.h"
-#include "lldb/Utility/Stream.h"
 
 #include <algorithm>
 
@@ -114,8 +113,7 @@ bool WatchpointResource::ShouldStop(StoppointCallbackContext *context) {
 }
 
 void WatchpointResource::Dump(Stream *s) const {
-  s->Printf("addr = 0x%8.8" PRIx64 " size = %zu", m_addr, m_size);
-  return;
+  return; // LWP_TODO
 }
 
 wp_resource_id_t WatchpointResource::GetNextID() {

lldb/source/Breakpoint/WatchpointAlgorithms.cpp

@@ -1139,22 +1139,9 @@ class CommandObjectWatchpointSetExpression : public CommandObjectRaw {
 
     // Fetch the type from the value object, the type of the watched object is
     // the pointee type
-    /// of the expression, so convert to that if we found a valid type.
+    /// of the expression, so convert to that if we  found a valid type.
     CompilerType compiler_type(valobj_sp->GetCompilerType());
 
-    std::optional<uint64_t> valobj_size = valobj_sp->GetByteSize();
-    // Set the type as a uint8_t array if the size being watched is
-    // larger than the ValueObject's size (which is probably the size
-    // of a pointer).
-    if (valobj_size && size > *valobj_size) {
-      auto type_system = compiler_type.GetTypeSystem();
-      if (type_system) {
-        CompilerType clang_uint8_type =
-            type_system->GetBuiltinTypeForEncodingAndBitSize(eEncodingUint, 8);
-        compiler_type = clang_uint8_type.GetArrayType(size);
-      }
-    }
-
     Status error;
     WatchpointSP watch_sp =
         target->CreateWatchpoint(addr, size, &compiler_type, watch_type, error);