[ELF] - Refactor of LinkerScript<ELFT>::getPhdrIndicesForSection
Previously it was harder to read and also has a error:
command kind was not checked.
Differential revision: https://reviews.llvm.org/D22574
llvm-svn: 276137
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index aaf2b9d..f0eff8e 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -450,23 +450,23 @@
template <class ELFT>
std::vector<size_t>
LinkerScript<ELFT>::getPhdrIndicesForSection(StringRef Name) {
- std::vector<size_t> Indices;
- auto ItSect = std::find_if(
- Opt.Commands.begin(), Opt.Commands.end(),
- [Name](const SectionsCommand &Cmd) { return Cmd.Name == Name; });
- if (ItSect != Opt.Commands.end()) {
- SectionsCommand &SecCmd = (*ItSect);
- for (StringRef PhdrName : SecCmd.Phdrs) {
- auto ItPhdr = std::find_if(
- Opt.PhdrsCommands.rbegin(), Opt.PhdrsCommands.rend(),
- [PhdrName](PhdrsCommand &Cmd) { return Cmd.Name == PhdrName; });
+ for (SectionsCommand &Cmd : Opt.Commands) {
+ if (Cmd.Kind != SectionKind || Cmd.Name != Name)
+ continue;
+
+ std::vector<size_t> Indices;
+ for (StringRef PhdrName : Cmd.Phdrs) {
+ auto ItPhdr =
+ std::find_if(Opt.PhdrsCommands.rbegin(), Opt.PhdrsCommands.rend(),
+ [&](PhdrsCommand &Cmd) { return Cmd.Name == PhdrName; });
if (ItPhdr == Opt.PhdrsCommands.rend())
error("section header '" + PhdrName + "' is not listed in PHDRS");
else
Indices.push_back(std::distance(ItPhdr, Opt.PhdrsCommands.rend()) - 1);
}
+ return Indices;
}
- return Indices;
+ return {};
}
class elf::ScriptParser : public ScriptParserBase {