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

[ELF] - Linkerscript: remove excessive ScriptConfiguration::Filler field 

Previously OutputSectionCommand::Filler was introduced, but unused.
Patch fixes that.

Differential revision: https://reviews.llvm.org/D22615

llvm-svn: 276253
This commit is contained in:
George Rimar 2016-07-21 07:48:54 +00:00
parent 7996340d9f
commit f6c3ccef5e
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lld/ELF/LinkerScript.cpp
View File

@ -410,10 +410,11 @@ LinkerScript<ELFT>::createPhdrs(ArrayRef<OutputSectionBase<ELFT> *> Sections) {
template <class ELFT>
ArrayRef<uint8_t> LinkerScript<ELFT>::getFiller(StringRef Name) {
auto I = Opt.Filler.find(Name);
if (I == Opt.Filler.end())
return {};
return I->second;
for (const std::unique_ptr<BaseCommand> &Base : Opt.Commands)
if (auto *Cmd = dyn_cast<OutputSectionCommand>(Base.get()))
if (Cmd->Name == Name)
return Cmd->Filler;
return {};
}
// Returns the index of the given section name in linker script
@ -754,7 +755,7 @@ void ScriptParser::readOutputSectionDescription(StringRef OutSec) {
return;
}
Tok = Tok.substr(3);
Opt.Filler[OutSec] = parseHex(Tok);
Cmd->Filler = parseHex(Tok);
next();
}
}

3
lld/ELF/LinkerScript.h
View File

@ -86,9 +86,6 @@ struct ScriptConfiguration {
// SECTIONS commands.
std::vector<SectionRule> Sections;
// Section fill attribute for each section.
llvm::StringMap<std::vector<uint8_t>> Filler;
// Used to assign addresses to sections.
std::vector<std::unique_ptr<BaseCommand>> Commands;