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

Return early. NFC. 

llvm-svn: 315137
This commit is contained in:
Rui Ueyama 2017-10-07 00:22:59 +00:00
parent 13593843f6
commit 850b554399
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lld/ELF/OutputSections.cpp
View File

@ -107,7 +107,16 @@ void OutputSection::addSection(InputSection *S) {
}
}
static SectionKey createKey(InputSectionBase *C, StringRef OutsecName) {
static SectionKey createKey(InputSectionBase *IS, StringRef OutsecName) {
// When control reaches here, mergeable sections have already been
// merged except the -r case. If that's the case, we want to combine
// mergeable sections by sh_entsize and sh_flags.
if (Config->Relocatable && (IS->Flags & SHF_MERGE)) {
uint64_t Flags = IS->Flags & (SHF_MERGE | SHF_STRINGS);
uint32_t Alignment = std::max<uint32_t>(IS->Alignment, IS->Entsize);
return SectionKey{OutsecName, Flags, Alignment};
}
// The ELF spec just says
// ----------------------------------------------------------------
// In the first phase, input sections that match in name, type and
@ -150,15 +159,7 @@ static SectionKey createKey(InputSectionBase *C, StringRef OutsecName) {
//
// Given the above issues, we instead merge sections by name and error on
// incompatible types and flags.
uint32_t Alignment = 0;
uint64_t Flags = 0;
if (Config->Relocatable && (C->Flags & SHF_MERGE)) {
Alignment = std::max<uint64_t>(C->Alignment, C->Entsize);
Flags = C->Flags & (SHF_MERGE | SHF_STRINGS);
}
return SectionKey{OutsecName, Flags, Alignment};
return SectionKey{OutsecName, 0, 0};
}
OutputSectionFactory::OutputSectionFactory() {}