using namespace lld;
using namespace lld::elf;
+ArrayRef<uint8_t> InputSectionData::getData(const SectionPiece &P) const {
+ return Data.slice(P.InputOff, P.size());
+}
+
template <class ELFT>
static ArrayRef<uint8_t> getSectionContents(elf::ObjectFile<ELFT> *File,
const typename ELFT::Shdr *Hdr) {
if (Piece.OutputOff == size_t(-1)) {
// Offsets of tail-merged strings are computed lazily.
auto *OutSec = static_cast<MergeOutputSection<ELFT> *>(this->OutSec);
- ArrayRef<uint8_t> D = Piece.data();
+ ArrayRef<uint8_t> D = this->getData(Piece);
StringRef S((const char *)D.data(), D.size());
Piece.OutputOff = OutSec->getOffset(S);
}
class DefinedCommon;
class SymbolBody;
+struct SectionPiece;
template <class ELFT> class ICF;
template <class ELFT> class DefinedRegular;
StringRef Name;
ArrayRef<uint8_t> Data;
+ ArrayRef<uint8_t> getData(const SectionPiece &P) const;
// If a section is compressed, this has the uncompressed section data.
std::unique_ptr<char[]> UncompressedData;
// SectionPiece represents a piece of splittable section contents.
struct SectionPiece {
SectionPiece(size_t Off, ArrayRef<uint8_t> Data, bool Live = false)
- : InputOff(Off), Data((const uint8_t *)Data.data()), Size(Data.size()),
- Live(Live || !Config->GcSections) {}
+ : InputOff(Off), Size(Data.size()), Live(Live || !Config->GcSections) {}
- ArrayRef<uint8_t> data() { return {Data, Size}; }
size_t size() const { return Size; }
size_t InputOff;
// We use bitfields because SplitInputSection is accessed by
// std::upper_bound very often.
// We want to save bits to make it cache friendly.
- const uint8_t *Data;
uint32_t Size : 31;
public:
struct EhSectionPiece : public SectionPiece {
EhSectionPiece(size_t Off, ArrayRef<uint8_t> Data, unsigned FirstRelocation)
- : SectionPiece(Off, Data), FirstRelocation(FirstRelocation) {}
+ : SectionPiece(Off, Data), Data(Data.data()),
+ FirstRelocation(FirstRelocation) {}
+ const uint8_t *Data;
+ ArrayRef<uint8_t> data() { return {Data, size()}; }
unsigned FirstRelocation;
};
size_t CieOffset = Cie->Piece->OutputOff;
writeCieFde<ELFT>(Buf + CieOffset, Cie->Piece->data());
- for (SectionPiece *Fde : Cie->FdePieces) {
+ for (EhSectionPiece *Fde : Cie->FdePieces) {
size_t Off = Fde->OutputOff;
writeCieFde<ELFT>(Buf + Off, Fde->data());
for (SectionPiece &Piece : Sec->Pieces) {
if (!Piece.Live)
continue;
- uintX_t OutputOffset = Builder.add(toStringRef(Piece.data()));
+ uintX_t OutputOffset = Builder.add(toStringRef(Sec->getData(Piece)));
if (!shouldTailMerge())
Piece.OutputOff = OutputOffset;
}