[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
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 85bfae7..7fa953d 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -410,10 +410,11 @@
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 @@
return;
}
Tok = Tok.substr(3);
- Opt.Filler[OutSec] = parseHex(Tok);
+ Cmd->Filler = parseHex(Tok);
next();
}
}
diff --git a/lld/ELF/LinkerScript.h b/lld/ELF/LinkerScript.h
index 20ab4be0..104cfca 100644
--- a/lld/ELF/LinkerScript.h
+++ b/lld/ELF/LinkerScript.h
@@ -86,9 +86,6 @@
// 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;