This is an archive of the discontinued LLVM Phabricator instance.

Differential D60299

ELF: Simplify. NFCI.
ClosedPublic

Authored by pcc on Apr 4 2019, 6:15 PM.

Details

Reviewers
ruiu
• espindola
Commits
rGad4376e8afdb: ELF: Simplify. NFCI.
rLLD357739: ELF: Simplify. NFCI.
rL357739: ELF: Simplify. NFCI.

Diff Detail

Repository
rL LLVM

Event Timeline

pcc created this revision.Apr 4 2019, 6:15 PM
Herald added a reviewer: • espindola. · View Herald TranscriptApr 4 2019, 6:15 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: MaskRay, arichardson, emaste. · View Herald Transcript
Harbormaster completed remote builds in B30087: Diff 193817.Apr 4 2019, 6:16 PM
ruiu accepted this revision.Apr 4 2019, 6:23 PM

LGTM

This revision is now accepted and ready to land.Apr 4 2019, 6:23 PM
Closed by commit rL357739: ELF: Simplify. NFCI. (authored by pcc). · Explain WhyApr 4 2019, 6:31 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
ELF/
11 lines

Diff 193818

lld/trunk/ELF/InputFiles.cpp

Show First 20 Lines • Show All 870 Lines • ▼ Show 20 Lines
template <class ELFT> template <class ELFT>
SharedFile<ELFT>::SharedFile(MemoryBufferRef M, StringRef DefaultSoName) SharedFile<ELFT>::SharedFile(MemoryBufferRef M, StringRef DefaultSoName)
: ELFFileBase<ELFT>(Base::SharedKind, M), SoName(DefaultSoName), : ELFFileBase<ELFT>(Base::SharedKind, M), SoName(DefaultSoName),
IsNeeded(!Config->AsNeeded) {} IsNeeded(!Config->AsNeeded) {}
// Partially parse the shared object file so that we can call // Partially parse the shared object file so that we can call
// getSoName on this object. // getSoName on this object.
template <class ELFT> void SharedFile<ELFT>::parseDynamic() { template <class ELFT> void SharedFile<ELFT>::parseDynamic() {
const Elf_Shdr *DynamicSec = nullptr; ArrayRef<Elf_Dyn> DynamicTags;
const ELFFile<ELFT> Obj = this->getObj(); const ELFFile<ELFT> Obj = this->getObj();
ArrayRef<Elf_Shdr> Sections = CHECK(Obj.sections(), this); ArrayRef<Elf_Shdr> Sections = CHECK(Obj.sections(), this);
// Search for .dynsym, .dynamic, .symtab, .gnu.version and .gnu.version_d. // Search for .dynsym, .dynamic, .symtab, .gnu.version and .gnu.version_d.
for (const Elf_Shdr &Sec : Sections) { for (const Elf_Shdr &Sec : Sections) {
switch (Sec.sh_type) { switch (Sec.sh_type) {
default: default:
continue; continue;
case SHT_DYNSYM: case SHT_DYNSYM:
this->initSymtab(Sections, &Sec); this->initSymtab(Sections, &Sec);
break; break;
case SHT_DYNAMIC: case SHT_DYNAMIC:
DynamicSec = &Sec; DynamicTags =
CHECK(Obj.template getSectionContentsAsArray<Elf_Dyn>(&Sec), this);
break; break;
case SHT_GNU_versym: case SHT_GNU_versym:
this->VersymSec = &Sec; this->VersymSec = &Sec;
break; break;
case SHT_GNU_verdef: case SHT_GNU_verdef:
this->VerdefSec = &Sec; this->VerdefSec = &Sec;
break; break;
} }
} }
if (this->VersymSec && this->ELFSyms.empty()) if (this->VersymSec && this->ELFSyms.empty())
error("SHT_GNU_versym should be associated with symbol table"); error("SHT_GNU_versym should be associated with symbol table");
// Search for a DT_SONAME tag to initialize this->SoName. // Search for a DT_SONAME tag to initialize this->SoName.
if (!DynamicSec) for (const Elf_Dyn &Dyn : DynamicTags) {
return;
ArrayRef<Elf_Dyn> Arr =
CHECK(Obj.template getSectionContentsAsArray<Elf_Dyn>(DynamicSec), this);
for (const Elf_Dyn &Dyn : Arr) {
if (Dyn.d_tag == DT_NEEDED) { if (Dyn.d_tag == DT_NEEDED) {
uint64_t Val = Dyn.getVal(); uint64_t Val = Dyn.getVal();
if (Val >= this->StringTable.size()) if (Val >= this->StringTable.size())
fatal(toString(this) + ": invalid DT_NEEDED entry"); fatal(toString(this) + ": invalid DT_NEEDED entry");
DtNeeded.push_back(this->StringTable.data() + Val); DtNeeded.push_back(this->StringTable.data() + Val);
} else if (Dyn.d_tag == DT_SONAME) { } else if (Dyn.d_tag == DT_SONAME) {
uint64_t Val = Dyn.getVal(); uint64_t Val = Dyn.getVal();
if (Val >= this->StringTable.size()) if (Val >= this->StringTable.size())
▲ Show 20 Lines • Show All 447 Lines • Show Last 20 Lines