From a33004aca708e49bfe4d0914b9d34da6d0abe330 Mon Sep 17 00:00:00 2001 From: Igor Kudrin Date: Fri, 16 Aug 2019 03:40:04 +0000 Subject: [PATCH] Remove the temporary code. NFC. That should have been done in rL368156 but somehow was missed. llvm-svn: 369082 --- .../llvm/DebugInfo/DWARF/DWARFDataExtractor.h | 13 -------- .../DebugInfo/DWARF/DWARFDataExtractor.cpp | 30 ------------------- 2 files changed, 43 deletions(-) diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h index 059aa82fccda..fae30a54b356 100644 --- a/llvm/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h +++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFDataExtractor.h @@ -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 getEncodedPointer(uint32_t *Offset, uint8_t Encoding, - uint64_t AbsPosOffset = 0) const; - }; } // end namespace llvm diff --git a/llvm/lib/DebugInfo/DWARF/DWARFDataExtractor.cpp b/llvm/lib/DebugInfo/DWARF/DWARFDataExtractor.cpp index 491f6b08b0ad..cb90f754a352 100644 --- a/llvm/lib/DebugInfo/DWARF/DWARFDataExtractor.cpp +++ b/llvm/lib/DebugInfo/DWARF/DWARFDataExtractor.cpp @@ -97,33 +97,3 @@ DWARFDataExtractor::getEncodedPointer(uint64_t *Offset, uint8_t Encoding, 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 -DWARFDataExtractor::getEncodedPointer(uint32_t *Offset, uint8_t Encoding, - uint64_t PCRelOffset) const { - return getEncodedPointer(WrapOffset(Offset), Encoding, PCRelOffset); -}