Revert "Add SBAddressRange and SBAddressRangeList to SB API (#92014)"

This reverts commit 42944e4.

lldb/bindings/headers.swig

@@ -8,8 +8,6 @@
 %{
 #include "lldb/lldb-public.h"
 #include "lldb/API/SBAddress.h"
-#include "lldb/API/SBAddressRange.h"
-#include "lldb/API/SBAddressRangeList.h"
 #include "lldb/API/SBAttachInfo.h"
 #include "lldb/API/SBBlock.h"
 #include "lldb/API/SBBreakpoint.h"

lldb/bindings/interfaces.swig

@@ -12,8 +12,6 @@
 
 /* Docstrings for SB classes and methods */
 %include "./interface/SBAddressDocstrings.i"
-%include "./interface/SBAddressRangeDocstrings.i"
-%include "./interface/SBAddressRangeListDocstrings.i"
 %include "./interface/SBAttachInfoDocstrings.i"
 %include "./interface/SBBlockDocstrings.i"
 %include "./interface/SBBreakpointDocstrings.i"
@@ -88,8 +86,6 @@
 
 /* API headers */
 %include "lldb/API/SBAddress.h"
-%include "lldb/API/SBAddressRange.h"
-%include "lldb/API/SBAddressRangeList.h"
 %include "lldb/API/SBAttachInfo.h"
 %include "lldb/API/SBBlock.h"
 %include "lldb/API/SBBreakpoint.h"
@@ -167,8 +163,6 @@
 
 /* Extensions for SB classes */
 %include "./interface/SBAddressExtensions.i"
-%include "./interface/SBAddressRangeExtensions.i"
-%include "./interface/SBAddressRangeListExtensions.i"
 %include "./interface/SBBlockExtensions.i"
 %include "./interface/SBBreakpointExtensions.i"
 %include "./interface/SBBreakpointListExtensions.i"

lldb/include/lldb/API/LLDB.h

@@ -10,8 +10,6 @@
 #define LLDB_API_LLDB_H
 
 #include "lldb/API/SBAddress.h"
-#include "lldb/API/SBAddressRange.h"
-#include "lldb/API/SBAddressRangeList.h"
 #include "lldb/API/SBAttachInfo.h"
 #include "lldb/API/SBBlock.h"
 #include "lldb/API/SBBreakpoint.h"

lldb/include/lldb/API/SBAddress.h

@@ -86,7 +86,6 @@ class LLDB_API SBAddress {
   lldb::SBLineEntry GetLineEntry();
 
 protected:
-  friend class SBAddressRange;
   friend class SBBlock;
   friend class SBBreakpoint;
   friend class SBBreakpointLocation;

lldb/include/lldb/API/SBBlock.h

@@ -9,8 +9,6 @@
 #ifndef LLDB_API_SBBLOCK_H
 #define LLDB_API_SBBLOCK_H
 
-#include "lldb/API/SBAddressRange.h"
-#include "lldb/API/SBAddressRangeList.h"
 #include "lldb/API/SBDefines.h"
 #include "lldb/API/SBFrame.h"
 #include "lldb/API/SBTarget.h"
@@ -54,8 +52,6 @@ class LLDB_API SBBlock {
 
   lldb::SBAddress GetRangeEndAddress(uint32_t idx);
 
-  lldb::SBAddressRangeList GetRanges();
-
   uint32_t GetRangeIndexForBlockAddress(lldb::SBAddress block_addr);
 
   lldb::SBValueList GetVariables(lldb::SBFrame &frame, bool arguments,

lldb/include/lldb/API/SBDefines.h

@@ -43,8 +43,6 @@
 namespace lldb {
 
 class LLDB_API SBAddress;
-class LLDB_API SBAddressRange;
-class LLDB_API SBAddressRangeList;
 class LLDB_API SBAttachInfo;
 class LLDB_API SBBlock;
 class LLDB_API SBBreakpoint;

lldb/include/lldb/API/SBFunction.h

@@ -10,7 +10,6 @@
 #define LLDB_API_SBFUNCTION_H
 
 #include "lldb/API/SBAddress.h"
-#include "lldb/API/SBAddressRangeList.h"
 #include "lldb/API/SBDefines.h"
 #include "lldb/API/SBInstructionList.h"
 
@@ -45,8 +44,6 @@ class LLDB_API SBFunction {
 
   lldb::SBAddress GetEndAddress();
 
-  lldb::SBAddressRangeList GetRanges();
-
   const char *GetArgumentName(uint32_t arg_idx);
 
   uint32_t GetPrologueByteSize();

lldb/include/lldb/API/SBStream.h

@@ -62,8 +62,6 @@ class LLDB_API SBStream {
 
 protected:
   friend class SBAddress;
-  friend class SBAddressRange;
-  friend class SBAddressRangeList;
   friend class SBBlock;
   friend class SBBreakpoint;
   friend class SBBreakpointLocation;

lldb/include/lldb/API/SBTarget.h

@@ -943,7 +943,6 @@ class LLDB_API SBTarget {
 
 protected:
   friend class SBAddress;
-  friend class SBAddressRange;
   friend class SBBlock;
   friend class SBBreakpoint;
   friend class SBBreakpointList;

lldb/include/lldb/Core/AddressRange.h

@@ -86,8 +86,6 @@ class AddressRange {
   /// (LLDB_INVALID_ADDRESS) and a zero byte size.
   void Clear();
 
-  bool IsValid() const;
-
   /// Check if a section offset address is contained in this range.
   ///
   /// \param[in] so_addr
@@ -238,24 +236,12 @@ class AddressRange {
   ///     The new size in bytes of this address range.
   void SetByteSize(lldb::addr_t byte_size) { m_byte_size = byte_size; }
 
-  bool GetDescription(Stream *s, Target *target) const;
-
-  bool operator==(const AddressRange &rhs);
-
-  bool operator!=(const AddressRange &rhs);
-
 protected:
   // Member variables
   Address m_base_addr;      ///< The section offset base address of this range.
   lldb::addr_t m_byte_size = 0; ///< The size in bytes of this address range.
 };
 
-// Forward-declarable wrapper.
-class AddressRanges : public std::vector<lldb_private::AddressRange> {
-public:
-  using std::vector<lldb_private::AddressRange>::vector;
-};
-
 } // namespace lldb_private
 
 #endif // LLDB_CORE_ADDRESSRANGE_H

lldb/include/lldb/Symbol/Block.h

@@ -355,8 +355,6 @@ class Block : public UserID, public SymbolContextScope {
   // be able to get at any of the address ranges in a block.
   bool GetRangeAtIndex(uint32_t range_idx, AddressRange &range);
 
-  AddressRanges GetRanges();
-
   bool GetStartAddress(Address &addr);
 
   void SetDidParseVariables(bool b, bool set_children);

lldb/include/lldb/lldb-forward.h

@@ -19,8 +19,6 @@ class ASTResultSynthesizer;
 class ASTStructExtractor;
 class Address;
 class AddressRange;
-class AddressRanges;
-class AddressRangeList;
 class AddressResolver;
 class ArchSpec;
 class Architecture;
@@ -310,7 +308,6 @@ template <unsigned N> class StreamBuffer;
 namespace lldb {
 
 typedef std::shared_ptr<lldb_private::ABI> ABISP;
-typedef std::unique_ptr<lldb_private::AddressRange> AddressRangeUP;
 typedef std::shared_ptr<lldb_private::Baton> BatonSP;
 typedef std::shared_ptr<lldb_private::Block> BlockSP;
 typedef std::shared_ptr<lldb_private::Breakpoint> BreakpointSP;