[DWARF] Revert r345546: Refactor range list extraction and dumping

This patch caused some internal tests to break which are being investigated.

llvm-svn: 345687

Author: wolfy1961

llvm/include/llvm/DebugInfo/DWARF/DWARFContext.h

@@ -231,16 +231,16 @@ class DWARFContext : public DIContext {
   /// Get a DIE given an exact offset.
   DWARFDie getDIEForOffset(uint32_t Offset);
 
-  unsigned getMaxVersion(uint16_t DefaultVersion = 0) {
+  unsigned getMaxVersion() {
     // Ensure info units have been parsed to discover MaxVersion
     info_section_units();
-    return MaxVersion ? MaxVersion : DefaultVersion;
+    return MaxVersion;
   }
 
-  unsigned getMaxDWOVersion(uint16_t DefaultVersion = 0) {
+  unsigned getMaxDWOVersion() {
     // Ensure DWO info units have been parsed to discover MaxVersion
     dwo_info_section_units();
-    return MaxVersion ? MaxVersion : DefaultVersion;
+    return MaxVersion;
   }
 
   void setMaxVersionIfGreater(unsigned Version) {

llvm/include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h

@@ -0,0 +1,85 @@
+//===- DWARFDebugRangeList.h ------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFDEBUGRANGELIST_H
+#define LLVM_DEBUGINFO_DWARF_DWARFDEBUGRANGELIST_H
+
+#include "llvm/DebugInfo/DWARF/DWARFAddressRange.h"
+#include "llvm/DebugInfo/DWARF/DWARFDataExtractor.h"
+#include <cassert>
+#include <cstdint>
+#include <vector>
+
+namespace llvm {
+
+class raw_ostream;
+
+class DWARFDebugRangeList {
+public:
+  struct RangeListEntry {
+    /// A beginning address offset. This address offset has the size of an
+    /// address and is relative to the applicable base address of the
+    /// compilation unit referencing this range list. It marks the beginning
+    /// of an address range.
+    uint64_t StartAddress;
+    /// An ending address offset. This address offset again has the size of
+    /// an address and is relative to the applicable base address of the
+    /// compilation unit referencing this range list. It marks the first
+    /// address past the end of the address range. The ending address must
+    /// be greater than or equal to the beginning address.
+    uint64_t EndAddress;
+    /// A section index this range belongs to.
+    uint64_t SectionIndex;
+
+    /// The end of any given range list is marked by an end of list entry,
+    /// which consists of a 0 for the beginning address offset
+    /// and a 0 for the ending address offset.
+    bool isEndOfListEntry() const {
+      return (StartAddress == 0) && (EndAddress == 0);
+    }
+
+    /// A base address selection entry consists of:
+    /// 1. The value of the largest representable address offset
+    /// (for example, 0xffffffff when the size of an address is 32 bits).
+    /// 2. An address, which defines the appropriate base address for
+    /// use in interpreting the beginning and ending address offsets of
+    /// subsequent entries of the location list.
+    bool isBaseAddressSelectionEntry(uint8_t AddressSize) const {
+      assert(AddressSize == 4 || AddressSize == 8);
+      if (AddressSize == 4)
+        return StartAddress == -1U;
+      else
+        return StartAddress == -1ULL;
+    }
+  };
+
+private:
+  /// Offset in .debug_ranges section.
+  uint32_t Offset;
+  uint8_t AddressSize;
+  std::vector<RangeListEntry> Entries;
+
+public:
+  DWARFDebugRangeList() { clear(); }
+
+  void clear();
+  void dump(raw_ostream &OS) const;
+  Error extract(const DWARFDataExtractor &data, uint32_t *offset_ptr);
+  const std::vector<RangeListEntry> &getEntries() { return Entries; }
+
+  /// getAbsoluteRanges - Returns absolute address ranges defined by this range
+  /// list. Has to be passed base address of the compile unit referencing this
+  /// range list.
+  DWARFAddressRangesVector
+  getAbsoluteRanges(llvm::Optional<SectionedAddress> BaseAddr) const;
+};
+
+} // end namespace llvm
+
+#endif // LLVM_DEBUGINFO_DWARF_DWARFDEBUGRANGELIST_H

llvm/include/llvm/DebugInfo/DWARF/DWARFDebugRnglists.h

@@ -13,17 +13,15 @@
 #include "llvm/ADT/Optional.h"
 #include "llvm/BinaryFormat/Dwarf.h"
 #include "llvm/DebugInfo/DIContext.h"
-#include "llvm/DebugInfo/DWARF/DWARFAddressRange.h"
 #include "llvm/DebugInfo/DWARF/DWARFDataExtractor.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
 #include "llvm/DebugInfo/DWARF/DWARFListTable.h"
 #include <cstdint>
 #include <map>
 #include <vector>
 
 namespace llvm {
 
-struct BaseAddress;
-class DWARFContext;
 class Error;
 class raw_ostream;
 class DWARFUnit;
@@ -37,30 +35,12 @@ struct RangeListEntry : public DWARFListEntryBase {
   uint64_t Value0;
   uint64_t Value1;
 
-  Error extract(DWARFDataExtractor Data, uint32_t End, uint16_t Version,
-                StringRef SectionName, uint32_t *OffsetPtr, bool isDWO = false);
-  bool isEndOfList() const { return EntryKind == dwarf::DW_RLE_end_of_list; }
-  bool isBaseAddressSelectionEntry() const {
-    return EntryKind == dwarf::DW_RLE_base_address;
-  }
-  uint64_t getStartAddress() const {
-    assert((EntryKind == dwarf::DW_RLE_start_end ||
-            EntryKind == dwarf::DW_RLE_offset_pair ||
-            EntryKind == dwarf::DW_RLE_startx_length) &&
-           "Unexpected range list entry kind");
-    return Value0;
-  }
-  uint64_t getEndAddress() const {
-    assert((EntryKind == dwarf::DW_RLE_start_end ||
-            EntryKind == dwarf::DW_RLE_offset_pair) &&
-           "Unexpected range list entry kind");
-    return Value1;
-  }
-  void dump(raw_ostream &OS, DWARFContext *C, uint8_t AddrSize, 
-            uint64_t &CurrentBase, unsigned Indent, uint16_t Version,
-            uint8_t MaxEncodingStringLength, DIDumpOptions DumpOpts,
+  Error extract(DWARFDataExtractor Data, uint32_t End, uint32_t *OffsetPtr);
+  void dump(raw_ostream &OS, uint8_t AddrSize, uint8_t MaxEncodingStringLength,
+            uint64_t &CurrentBase, DIDumpOptions DumpOpts,
             llvm::function_ref<Optional<SectionedAddress>(uint32_t)>
                 LookupPooledAddress) const;
+  bool isSentinel() const { return EntryKind == dwarf::DW_RLE_end_of_list; }
 };
 
 /// A class representing a single rangelist.
@@ -74,12 +54,10 @@ class DWARFDebugRnglist : public DWARFListType<RangeListEntry> {
 
 class DWARFDebugRnglistTable : public DWARFListTableBase<DWARFDebugRnglist> {
 public:
-  DWARFDebugRnglistTable(DWARFContext *C, StringRef SectionName,
-                         bool isDWO = false)
-      : DWARFListTableBase(C, SectionName, isDWO,
+  DWARFDebugRnglistTable()
+      : DWARFListTableBase(/* SectionName    = */ ".debug_rnglists",
                            /* HeaderString   = */ "ranges:",
-                           /* ListTypeString = */ "range",
-                           dwarf::RangeListEncodingString) {}
+                           /* ListTypeString = */ "range") {}
 };
 
 } // end namespace llvm