Skip to content

Commit a33004a

Browse files
committed
Remove the temporary code. NFC.
That should have been done in rL368156 but somehow was missed. llvm-svn: 369082
1 parent a53cce9 commit a33004a

File tree

2 files changed

+0
-43
lines changed

2 files changed

+0
-43
lines changed

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,6 @@ class DWARFDataExtractor : public DataExtractor {
5252
uint64_t AbsPosOffset = 0) const;
5353

5454
size_t size() const { return Section == nullptr ? 0 : Section->Data.size(); }
55-
56-
// The following methods are temporarily kept in order to preserve
57-
// compatibility with existing code and migrate to 64-bit offsets smoothly.
58-
// They will be removed when the migration is finished.
59-
// Please do not use them in new code.
60-
uint64_t getRelocatedValue(uint32_t Size, uint32_t *Off,
61-
uint64_t *SectionIndex = nullptr) const;
62-
uint64_t getRelocatedAddress(uint32_t *Off, uint64_t *SecIx = nullptr) const {
63-
return getRelocatedValue(getAddressSize(), Off, SecIx);
64-
}
65-
Optional<uint64_t> getEncodedPointer(uint32_t *Offset, uint8_t Encoding,
66-
uint64_t AbsPosOffset = 0) const;
67-
6855
};
6956

7057
} // end namespace llvm

llvm/lib/DebugInfo/DWARF/DWARFDataExtractor.cpp

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -97,33 +97,3 @@ DWARFDataExtractor::getEncodedPointer(uint64_t *Offset, uint8_t Encoding,
9797

9898
return Result;
9999
}
100-
101-
// The following is temporary code aimed to preserve compatibility with
102-
// existing code which uses 32-bit offsets.
103-
// It will be removed when migration to 64-bit offsets is finished.
104-
105-
namespace {
106-
107-
class WrapOffset {
108-
uint64_t Offset64;
109-
uint32_t *Offset32;
110-
111-
public:
112-
WrapOffset(uint32_t *Offset)
113-
: Offset64(*Offset), Offset32(Offset) {}
114-
~WrapOffset() { *Offset32 = Offset64; }
115-
operator uint64_t *() { return &Offset64; }
116-
};
117-
118-
}
119-
120-
uint64_t DWARFDataExtractor::getRelocatedValue(uint32_t Size, uint32_t *Off,
121-
uint64_t *SecNdx) const {
122-
return getRelocatedValue(Size, WrapOffset(Off), SecNdx);
123-
}
124-
125-
Optional<uint64_t>
126-
DWARFDataExtractor::getEncodedPointer(uint32_t *Offset, uint8_t Encoding,
127-
uint64_t PCRelOffset) const {
128-
return getEncodedPointer(WrapOffset(Offset), Encoding, PCRelOffset);
129-
}

0 commit comments

Comments
 (0)