diff options
| author | George Rimar <grimar@accesssoftek.com> | 2017-09-13 07:54:47 +0000 |
|---|---|---|
| committer | George Rimar <grimar@accesssoftek.com> | 2017-09-13 07:54:47 +0000 |
| commit | cb888a620d61da9b12639d24779a7c62b03f06f1 (patch) | |
| tree | 45a7ca5db39ad35f5e182b449c43029dd0d686ea | |
| parent | 2b6bfda5610d97755b5de4c427e1e4993351335f (diff) | |
| download | bcm5719-llvm-cb888a620d61da9b12639d24779a7c62b03f06f1.tar.gz bcm5719-llvm-cb888a620d61da9b12639d24779a7c62b03f06f1.zip | |
[ELF] - Refactor of Writer<ELFT>::forEachRelSec.
There is no need to scan over all input sections for relocatable output.
As we do not process or scan relocations anyways.
Patch moves check for Config->Relocatable out to avoid that and also removes
excessive check for isa<EhInputSection> from first for loop.
It is excessive because we handle all of them in a second for loop below.
That all allowed to simplify code.
Differential revision: https://reviews.llvm.org/D37746
llvm-svn: 313127
| -rw-r--r-- | lld/ELF/Writer.cpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp index 650628008f9..4f6f75dda58 100644 --- a/lld/ELF/Writer.cpp +++ b/lld/ELF/Writer.cpp @@ -880,24 +880,16 @@ template <class ELFT> static void sortBySymbolsOrder() { template <class ELFT> void Writer<ELFT>::forEachRelSec(std::function<void(InputSectionBase &)> Fn) { - for (InputSectionBase *IS : InputSections) { - if (!IS->Live) - continue; - // Scan all relocations. Each relocation goes through a series - // of tests to determine if it needs special treatment, such as - // creating GOT, PLT, copy relocations, etc. - // Note that relocations for non-alloc sections are directly - // processed by InputSection::relocateNonAlloc. - if (!(IS->Flags & SHF_ALLOC)) - continue; - if (isa<InputSection>(IS) || isa<EhInputSection>(IS)) + // Scan all relocations. Each relocation goes through a series + // of tests to determine if it needs special treatment, such as + // creating GOT, PLT, copy relocations, etc. + // Note that relocations for non-alloc sections are directly + // processed by InputSection::relocateNonAlloc. + for (InputSectionBase *IS : InputSections) + if (IS->Live && isa<InputSection>(IS) && (IS->Flags & SHF_ALLOC)) Fn(*IS); - } - - if (!Config->Relocatable) { - for (EhInputSection *ES : In<ELFT>::EhFrame->Sections) - Fn(*ES); - } + for (EhInputSection *ES : In<ELFT>::EhFrame->Sections) + Fn(*ES); } template <class ELFT> void Writer<ELFT>::createSections() { @@ -1280,7 +1272,8 @@ template <class ELFT> void Writer<ELFT>::finalizeSections() { // Scan relocations. This must be done after every symbol is declared so that // we can correctly decide if a dynamic relocation is needed. - forEachRelSec(scanRelocations<ELFT>); + if (!Config->Relocatable) + forEachRelSec(scanRelocations<ELFT>); if (InX::Plt && !InX::Plt->empty()) InX::Plt->addSymbols(); |

