[llvm] r369082 - Remove the temporary code. NFC.

[Igor Kudrin via llvm-commits]

Author: ikudrin
Date: Thu Aug 15 20:40:04 2019
New Revision: 369082

URL: http://llvm.org/viewvc/llvm-project?rev=369082&view=rev
Log:
Remove the temporary code. NFC.

That should have been done in rL368156 but somehow was missed.


Modified:
    llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h
    llvm/trunk/lib/DebugInfo/DWARF/DWARFDataExtractor.cpp

Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h?rev=369082&r1=369081&r2=369082&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h Thu Aug 15 20:40:04 2019
@@ -52,19 +52,6 @@ public:
                                        uint64_t AbsPosOffset = 0) const;
 
   size_t size() const { return Section == nullptr ? 0 : Section->Data.size(); }
-
-  // The following methods are temporarily kept in order to preserve
-  // compatibility with existing code and migrate to 64-bit offsets smoothly.
-  // They will be removed when the migration is finished.
-  // Please do not use them in new code.
-  uint64_t getRelocatedValue(uint32_t Size, uint32_t *Off,
-                             uint64_t *SectionIndex = nullptr) const;
-  uint64_t getRelocatedAddress(uint32_t *Off, uint64_t *SecIx = nullptr) const {
-    return getRelocatedValue(getAddressSize(), Off, SecIx);
-  }
-  Optional<uint64_t> getEncodedPointer(uint32_t *Offset, uint8_t Encoding,
-                                       uint64_t AbsPosOffset = 0) const;
-
 };
 
 } // end namespace llvm

Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFDataExtractor.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDataExtractor.cpp?rev=369082&r1=369081&r2=369082&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFDataExtractor.cpp (original)
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFDataExtractor.cpp Thu Aug 15 20:40:04 2019
@@ -97,33 +97,3 @@ DWARFDataExtractor::getEncodedPointer(ui
 
   return Result;
 }
-
-// The following is temporary code aimed to preserve compatibility with
-// existing code which uses 32-bit offsets.
-// It will be removed when migration to 64-bit offsets is finished.
-
-namespace {
-
-class WrapOffset {
-  uint64_t Offset64;
-  uint32_t *Offset32;
-
-public:
-  WrapOffset(uint32_t *Offset)
-      : Offset64(*Offset), Offset32(Offset) {}
-  ~WrapOffset() { *Offset32 = Offset64; }
-  operator uint64_t *() { return &Offset64; }
-};
-
-}
-
-uint64_t DWARFDataExtractor::getRelocatedValue(uint32_t Size, uint32_t *Off,
-                                               uint64_t *SecNdx) const {
-  return getRelocatedValue(Size, WrapOffset(Off), SecNdx);
-}
-
-Optional<uint64_t>
-DWARFDataExtractor::getEncodedPointer(uint32_t *Offset, uint8_t Encoding,
-                                      uint64_t PCRelOffset) const {
-  return getEncodedPointer(WrapOffset(Offset), Encoding, PCRelOffset);
-}