replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge createOrphanCommands into addOrphanSections. 

This is a bit simpler and avoids a walk over OutputSections.

llvm-svn: 307178
This commit is contained in:
Rafael Espindola 2017-07-05 17:50:43 +00:00
parent 55006b407b
commit d7faa9165f
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lld/ELF/LinkerScript.cpp
View File

@ -481,19 +481,31 @@ void LinkerScript::fabricateDefaultCommands() {
// Add sections that didn't match any sections command.
void LinkerScript::addOrphanSections(OutputSectionFactory &Factory) {
unsigned NumCommands = Opt.Commands.size();
for (InputSectionBase *S : InputSections) {
if (!S->Live || S->Parent)
continue;
StringRef Name = getOutputSectionName(S->Name);
auto I = llvm::find_if(Opt.Commands, [&](BaseCommand *Base) {
auto End = Opt.Commands.begin() + NumCommands;
auto I = std::find_if(Opt.Commands.begin(), End, [&](BaseCommand *Base) {
if (auto *Cmd = dyn_cast<OutputSectionCommand>(Base))
return Cmd->Name == Name;
return false;
});
if (I == Opt.Commands.end()) {
OutputSectionCommand *Cmd;
if (I == End) {
Factory.addInputSec(S, Name);
OutputSection *Sec = S->getOutputSection();
assert(Sec->SectionIndex == INT_MAX);
OutputSectionCommand *&CmdRef = SecToCommand[Sec];
if (!CmdRef) {
CmdRef = createOutputSectionCommand(Sec->Name, "<internal>");
CmdRef->Sec = Sec;
Opt.Commands.push_back(CmdRef);
}
Cmd = CmdRef;
} else {
auto *Cmd = cast<OutputSectionCommand>(*I);
Cmd = cast<OutputSectionCommand>(*I);
Factory.addInputSec(S, Name, Cmd->Sec);
if (OutputSection *Sec = Cmd->Sec) {
SecToCommand[Sec] = Cmd;
@ -501,10 +513,10 @@ void LinkerScript::addOrphanSections(OutputSectionFactory &Factory) {
assert(Sec->SectionIndex == INT_MAX || Sec->SectionIndex == Index);
Sec->SectionIndex = Index;
}
auto *ISD = make<InputSectionDescription>("");
ISD->Sections.push_back(cast<InputSection>(S));
Cmd->Commands.push_back(ISD);
}
auto *ISD = make<InputSectionDescription>("");
ISD->Sections.push_back(cast<InputSection>(S));
Cmd->Commands.push_back(ISD);
}
}
@ -759,21 +771,6 @@ void LinkerScript::adjustSectionsAfterSorting() {
removeEmptyCommands();
}
void LinkerScript::createOrphanCommands() {
for (OutputSection *Sec : OutputSections) {
if (Sec->SectionIndex != INT_MAX)
continue;
OutputSectionCommand *Cmd =
createOutputSectionCommand(Sec->Name, "<internal>");
Cmd->Sec = Sec;
SecToCommand[Sec] = Cmd;
auto *ISD = make<InputSectionDescription>("");
ISD->Sections = Sec->Sections;
Cmd->Commands.push_back(ISD);
Opt.Commands.push_back(Cmd);
}
}
void LinkerScript::processNonSectionCommands() {
for (BaseCommand *Base : Opt.Commands) {
if (auto *Cmd = dyn_cast<SymbolAssignment>(Base))

1
lld/ELF/LinkerScript.h
View File

@ -279,7 +279,6 @@ public:
bool hasLMA(OutputSection *Sec);
bool shouldKeep(InputSectionBase *S);
void assignOffsets(OutputSectionCommand *Cmd);
void createOrphanCommands();
void processNonSectionCommands();
void assignAddresses();
void allocateHeaders(std::vector<PhdrEntry> &Phdrs);

1
lld/ELF/Writer.cpp
View File

@ -181,7 +181,6 @@ template <class ELFT> void Writer<ELFT>::run() {
// Linker scripts may have left some input sections unassigned.
// Assign such sections using the default rule.
Script->addOrphanSections(Factory);
Script->createOrphanCommands();
} else {
// If linker script does not contain SECTIONS commands, create
// output sections by default rules. We still need to give the