Address comments.

Author: Sterling-Augustine

llvm/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h

@@ -40,28 +40,6 @@ class DWARFDataExtractor : public DWARFDataExtractorBase<DWARFDataExtractor> {
                                Other.isLittleEndian(), Other.getAddressSize()),
         Obj(Other.Obj), Section(Other.Section) {}
 
-  /// Extracts the DWARF "initial length" field, which can either be a 32-bit
-  /// value smaller than 0xfffffff0, or the value 0xffffffff followed by a
-  /// 64-bit length. Returns the actual length, and the DWARF format which is
-  /// encoded in the field. In case of errors, it returns {0, DWARF32} and
-  /// leaves the offset unchanged.
-  LLVM_ABI std::pair<uint64_t, dwarf::DwarfFormat>
-  getInitialLength(uint64_t *Off, Error *Err = nullptr) const;
-
-  std::pair<uint64_t, dwarf::DwarfFormat> getInitialLength(Cursor &C) const {
-    return getInitialLength(&getOffset(C), &getError(C));
-  }
-
-  /// Extracts a value and applies a relocation to the result if
-  /// one exists for the given offset.
-  LLVM_ABI uint64_t getRelocatedValue(uint32_t Size, uint64_t *Off,
-                                      uint64_t *SectionIndex = nullptr,
-                                      Error *Err = nullptr) const;
-  LLVM_ABI uint64_t getRelocatedValue(Cursor &C, uint32_t Size,
-                                      uint64_t *SectionIndex = nullptr) const {
-    return getRelocatedValue(Size, &getOffset(C), SectionIndex, &getError(C));
-  }
-
   /// Extracts a value and applies a relocation to the result if
   /// one exists for the given offset.
   LLVM_ABI uint64_t getRelocatedValueImpl(uint32_t Size, uint64_t *Off,

llvm/include/llvm/DebugInfo/DWARF/DWARFDataExtractorSimple.h

@@ -23,7 +23,8 @@ namespace llvm {
 /// A DataExtractor suitable use for parsing dwarf from memory.  Clients use
 /// Relocator::getRelocatedValueImpl to relocate values as appropriate.
 
-template <class Relocator> class DWARFDataExtractorBase : public DataExtractor {
+template <typename Relocator>
+class DWARFDataExtractorBase : public DataExtractor {
 
 public:
   DWARFDataExtractorBase(StringRef Data, bool IsLittleEndian,
@@ -40,15 +41,14 @@ template <class Relocator> class DWARFDataExtractorBase : public DataExtractor {
       : DataExtractor(Other.getData().substr(0, Length), Other.isLittleEndian(),
                       Other.getAddressSize()) {}
 
-  ~DWARFDataExtractorBase() {}
-
   /// Extracts a value and returns it as adjusted by the Relocator
   LLVM_ABI uint64_t getRelocatedValue(uint32_t Size, uint64_t *Off,
                                       uint64_t *SectionIndex = nullptr,
                                       Error *Err = nullptr) const {
     return static_cast<const Relocator *>(this)->getRelocatedValueImpl(
         Size, Off, SectionIndex, Err);
   }
+
   LLVM_ABI uint64_t getRelocatedValue(Cursor &C, uint32_t Size,
                                       uint64_t *SectionIndex = nullptr) const {
     return getRelocatedValue(Size, &getOffset(C), SectionIndex, &getError(C));
@@ -59,6 +59,7 @@ template <class Relocator> class DWARFDataExtractorBase : public DataExtractor {
                                         uint64_t *SecIx = nullptr) const {
     return getRelocatedValue(getAddressSize(), Off, SecIx);
   }
+
   LLVM_ABI uint64_t getRelocatedAddress(Cursor &C,
                                         uint64_t *SecIx = nullptr) const {
     return getRelocatedValue(getAddressSize(), &getOffset(C), SecIx,