maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Do not start over relocation search from beginning. 

This patch addresses a post-commit review for r270325. r270325
introduced getReloc function that searches a relocation for a
given range. It always started searching from beginning of relocation
vector, so it was slower than before. Previously, we used to use
the fact that the relocations are sorted. This patch restore it.

llvm-svn: 270572
This commit is contained in:
Rui Ueyama 2016-05-24 15:40:46 +00:00
parent 0a28e680f7
commit 19ccffe4bc
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lld/ELF/OutputSections.cpp
View File

@ -920,14 +920,21 @@ void EhOutputSection<ELFT>::forEachInputSection(
// Returns the first relocation that points to a region // Returns the first relocation that points to a region
// between Begin and Begin+Size. // between Begin and Begin+Size.
template <class IntTy, class RelTy> template <class IntTy, class RelTy>
static const RelTy *getReloc(IntTy Begin, IntTy Size, ArrayRef<RelTy> Rels) { static const RelTy *getReloc(IntTy Begin, IntTy Size, ArrayRef<RelTy> &Rels) {
size_t I = 0; for (auto I = Rels.begin(), E = Rels.end(); I != E; ++I) {
size_t E = Rels.size(); if (I->r_offset < Begin)
while (I != E && Rels[I].r_offset < Begin) continue;
++I;
if (I == E || Begin + Size <= Rels[I].r_offset) // Truncate Rels for fast access. That means we expect that the
// relocations are sorted and we are looking up symbols in
// sequential order. It is naturally satisfied for .eh_frame.
Rels = Rels.slice(I - Rels.begin());
if (I->r_offset < Begin + Size)
return I;
return nullptr; return nullptr;
return &Rels[I]; }
Rels = ArrayRef<RelTy>();
return nullptr;
} }
// Search for an existing CIE record or create a new one. // Search for an existing CIE record or create a new one.
@ -937,7 +944,7 @@ template <class ELFT>
template <class RelTy> template <class RelTy>
CieRecord *EhOutputSection<ELFT>::addCie(SectionPiece &Piece, CieRecord *EhOutputSection<ELFT>::addCie(SectionPiece &Piece,
EhInputSection<ELFT> *Sec, EhInputSection<ELFT> *Sec,
ArrayRef<RelTy> Rels) { ArrayRef<RelTy> &Rels) {
const endianness E = ELFT::TargetEndianness; const endianness E = ELFT::TargetEndianness;
if (read32<E>(Piece.Data.data() + 4) != 0) if (read32<E>(Piece.Data.data() + 4) != 0)
fatal("CIE expected at beginning of .eh_frame: " + Sec->getSectionName()); fatal("CIE expected at beginning of .eh_frame: " + Sec->getSectionName());
@ -971,7 +978,7 @@ template <class ELFT>
template <class RelTy> template <class RelTy>
bool EhOutputSection<ELFT>::isFdeLive(SectionPiece &Piece, bool EhOutputSection<ELFT>::isFdeLive(SectionPiece &Piece,
EhInputSection<ELFT> *Sec, EhInputSection<ELFT> *Sec,
ArrayRef<RelTy> Rels) { ArrayRef<RelTy> &Rels) {
const RelTy *Rel = getReloc(Piece.InputOff, Piece.size(), Rels); const RelTy *Rel = getReloc(Piece.InputOff, Piece.size(), Rels);
if (!Rel) if (!Rel)
fatal("FDE doesn't reference another section"); fatal("FDE doesn't reference another section");

4
lld/ELF/OutputSections.h
View File

@ -357,11 +357,11 @@ private:
template <class RelTy> template <class RelTy>
CieRecord *addCie(SectionPiece &Piece, EhInputSection<ELFT> *Sec, CieRecord *addCie(SectionPiece &Piece, EhInputSection<ELFT> *Sec,
ArrayRef<RelTy> Rels); ArrayRef<RelTy> &Rels);
template <class RelTy> template <class RelTy>
bool isFdeLive(SectionPiece &Piece, EhInputSection<ELFT> *Sec, bool isFdeLive(SectionPiece &Piece, EhInputSection<ELFT> *Sec,
ArrayRef<RelTy> Rels); ArrayRef<RelTy> &Rels);
uintX_t getFdePc(uint8_t *Buf, size_t Off, uint8_t Enc); uintX_t getFdePc(uint8_t *Buf, size_t Off, uint8_t Enc);