Inline what AdjustBreakpoint was doing.

Author: DavidSpickett

lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg.cpp

@@ -44,15 +44,26 @@ uint32_t NativeRegisterContextDBReg::SetHardwareBreakpoint(lldb::addr_t addr,
     return LLDB_INVALID_INDEX32;
   }
 
-  uint32_t control_value = 0, bp_index = 0;
-
   if (!ValidateBreakpoint(size, addr))
     return LLDB_INVALID_INDEX32;
 
-  control_value = MakeBreakControlValue(size);
+  uint32_t control_value = MakeBreakControlValue(size);
+
+  // LLDB does this before making the request, but other clients may not.
+  switch (size) {
+  case 2:
+    addr &= ~1;
+    break;
+  case 4:
+    addr &= ~3;
+    break;
+  default:
+    // ValidateBreakpoint should have rejected this.
+    llvm_unreachable("Invalid breakpoint size.");
+  }
 
   // Iterate over stored breakpoints and find a free bp_index
-  bp_index = LLDB_INVALID_INDEX32;
+  uint32_t bp_index = LLDB_INVALID_INDEX32;
   for (uint32_t i = 0; i < m_max_hbp_supported; i++) {
     if (!BreakpointIsEnabled(i))
       bp_index = i; // Mark last free slot

lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg.h

@@ -88,12 +88,6 @@ class NativeRegisterContextDBReg
   virtual std::optional<WatchpointDetails>
   AdjustWatchpoint(const WatchpointDetails &details) = 0;
 
-  using BreakpointDetails = WatchpointDetails;
-  virtual std::optional<BreakpointDetails>
-  AdjustBreakpoint(const BreakpointDetails &details) {
-    return details;
-  }
-
   virtual uint32_t MakeBreakControlValue(size_t size) = 0;
   virtual uint32_t MakeWatchControlValue(lldb::addr_t addr, size_t size,
                                          uint32_t watch_flags) = 0;

lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm.cpp

@@ -32,25 +32,6 @@ uint32_t NativeRegisterContextDBReg_arm::GetWatchpointSize(uint32_t wp_index) {
   }
 }
 
-std::optional<NativeRegisterContextDBReg::BreakpointDetails>
-NativeRegisterContextDBReg_arm::AdjustBreakpoint(
-    const BreakpointDetails &details) {
-  BreakpointDetails bd = details;
-  // Use size to get a hint of arm vs thumb modes.
-  switch (bd.size) {
-  case 2:
-    bd.addr &= ~1;
-    break;
-  case 4:
-    bd.addr &= ~3;
-    break;
-  default:
-    return {};
-  }
-
-  return bd;
-}
-
 std::optional<NativeRegisterContextDBReg::WatchpointDetails>
 NativeRegisterContextDBReg_arm::AdjustWatchpoint(
     const WatchpointDetails &details) {

lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm.h

@@ -24,15 +24,13 @@ class NativeRegisterContextDBReg_arm : public NativeRegisterContextDBReg {
   std::optional<WatchpointDetails>
   AdjustWatchpoint(const WatchpointDetails &details) override;
 
-  std::optional<BreakpointDetails>
-  AdjustBreakpoint(const BreakpointDetails &details) override;
-
   uint32_t MakeBreakControlValue(size_t size) override;
 
   uint32_t MakeWatchControlValue(lldb::addr_t addr, size_t size,
                                  uint32_t watch_flags) override;
 
-  bool ValidateBreakpoint(size_t size, lldb::addr_t addr) override {
+  bool ValidateBreakpoint(size_t size,
+                          [[maybe_unused]] lldb::addr_t addr) override {
     // Break on 4 or 2 byte instructions.
     return size == 4 || size == 2;
   }