[PATCH] D40966: [LLD][ELF] Refactor to remove loop copying all Sections in OS->finalize() [NFC]
Peter Smith via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Dec 12 05:39:35 PST 2017
This revision was not accepted when it landed; it landed in state "Needs Review".
This revision was automatically updated to reflect the committed changes.
Closed by commit rLLD320478: [ELF] Refactor to remove loop copying all Sections in OS->finalize() [NFC] (authored by psmith, committed by ).
Herald added subscribers: kristof.beyls, aemerson.
Changed prior to commit:
https://reviews.llvm.org/D40966?vs=125979&id=126536#toc
Repository:
rLLD LLVM Linker
https://reviews.llvm.org/D40966
Files:
ELF/OutputSections.cpp
Index: ELF/OutputSections.cpp
===================================================================
--- ELF/OutputSections.cpp
+++ ELF/OutputSections.cpp
@@ -275,26 +275,28 @@
template <class ELFT>
static void finalizeShtGroup(OutputSection *OS,
- ArrayRef<InputSection *> Sections) {
- assert(Config->Relocatable && Sections.size() == 1);
+ InputSection *Section) {
+ assert(Config->Relocatable);
// sh_link field for SHT_GROUP sections should contain the section index of
// the symbol table.
OS->Link = InX::SymTab->getParent()->SectionIndex;
// sh_info then contain index of an entry in symbol table section which
// provides signature of the section group.
- ObjFile<ELFT> *Obj = Sections[0]->getFile<ELFT>();
+ ObjFile<ELFT> *Obj = Section->getFile<ELFT>();
ArrayRef<Symbol *> Symbols = Obj->getSymbols();
- OS->Info = InX::SymTab->getSymbolIndex(Symbols[Sections[0]->Info]);
+ OS->Info = InX::SymTab->getSymbolIndex(Symbols[Section->Info]);
}
template <class ELFT> void OutputSection::finalize() {
- std::vector<InputSection *> Sections;
+ InputSection *First = nullptr;
for (BaseCommand *Base : SectionCommands) {
if (auto *ISD = dyn_cast<InputSectionDescription>(Base)) {
- for (InputSection *&IS : ISD->Sections)
- Sections.push_back(IS);
+ if (ISD->Sections.empty())
+ continue;
+ if (First == nullptr)
+ First = ISD->Sections.front();
}
if (isa<ByteCommand>(Base) && Type == SHT_NOBITS)
Type = SHT_PROGBITS;
@@ -305,19 +307,18 @@
// SHF_LINK_ORDER flag. The dependency is indicated by the sh_link field. We
// need to translate the InputSection sh_link to the OutputSection sh_link,
// all InputSections in the OutputSection have the same dependency.
- if (auto *D = Sections.front()->getLinkOrderDep())
+ if (auto *D = First->getLinkOrderDep())
Link = D->getParent()->SectionIndex;
}
if (Type == SHT_GROUP) {
- finalizeShtGroup<ELFT>(this, Sections);
+ finalizeShtGroup<ELFT>(this, First);
return;
}
if (!Config->CopyRelocs || (Type != SHT_RELA && Type != SHT_REL))
return;
- InputSection *First = Sections[0];
if (isa<SyntheticSection>(First))
return;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D40966.126536.patch
Type: text/x-patch
Size: 2292 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20171212/24b34b80/attachment.bin>
More information about the llvm-commits
mailing list