[llvm] r348264 - [yaml2obj] Move redundant statements into a separate static function
Xing GUO via llvm-commits
llvm-commits at lists.llvm.org
Tue Dec 4 06:27:51 PST 2018
Author: higuoxing
Date: Tue Dec 4 06:27:51 2018
New Revision: 348264
URL: http://llvm.org/viewvc/llvm-project?rev=348264&view=rev
Log:
[yaml2obj] Move redundant statements into a separate static function
Reviewers: jhenderson, grimar
Reviewed By: jhenderson
Subscribers: jakehehrlich, llvm-commits
Differential Revision: https://reviews.llvm.org/D55220
Modified:
llvm/trunk/tools/yaml2obj/yaml2elf.cpp
Modified: llvm/trunk/tools/yaml2obj/yaml2elf.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/yaml2obj/yaml2elf.cpp?rev=348264&r1=348263&r2=348264&view=diff
==============================================================================
--- llvm/trunk/tools/yaml2obj/yaml2elf.cpp (original)
+++ llvm/trunk/tools/yaml2obj/yaml2elf.cpp Tue Dec 4 06:27:51 2018
@@ -226,6 +226,16 @@ void ELFState<ELFT>::initProgramHeaders(
}
}
+static bool convertSectionIndex(NameToIdxMap &SN2I, StringRef SecName,
+ StringRef IndexSrc, unsigned &IndexDest) {
+ if (SN2I.lookup(IndexSrc, IndexDest) && !to_integer(IndexSrc, IndexDest)) {
+ WithColor::error() << "Unknown section referenced: '" << IndexSrc
+ << "' at YAML section '" << SecName << "'.\n";
+ return false;
+ }
+ return true;
+}
+
template <class ELFT>
bool ELFState<ELFT>::initSectionHeaders(std::vector<Elf_Shdr> &SHeaders,
ContiguousBlobAccumulator &CBA) {
@@ -245,11 +255,8 @@ bool ELFState<ELFT>::initSectionHeaders(
if (!Sec->Link.empty()) {
unsigned Index;
- if (SN2I.lookup(Sec->Link, Index) && !to_integer(Sec->Link, Index)) {
- WithColor::error() << "Unknown section referenced: '" << Sec->Link
- << "' at YAML section '" << Sec->Name << "'.\n";
+ if (!convertSectionIndex(SN2I, Sec->Name, Sec->Link, Index))
return false;
- }
SHeader.sh_link = Index;
}
@@ -261,13 +268,9 @@ bool ELFState<ELFT>::initSectionHeaders(
SHeader.sh_link = getDotSymTabSecNo();
unsigned Index;
- if (SN2I.lookup(S->Info, Index) && !to_integer(S->Info, Index)) {
- WithColor::error() << "Unknown section referenced: '" << S->Info
- << "' at YAML section '" << S->Name << "'.\n";
+ if (!convertSectionIndex(SN2I, S->Name, S->Info, Index))
return false;
- }
SHeader.sh_info = Index;
-
if (!writeSectionContent(SHeader, *S, CBA))
return false;
} else if (auto S = dyn_cast<ELFYAML::Group>(Sec.get())) {
@@ -535,13 +538,9 @@ bool ELFState<ELFT>::writeSectionContent
unsigned int sectionIndex = 0;
if (member.sectionNameOrType == "GRP_COMDAT")
sectionIndex = llvm::ELF::GRP_COMDAT;
- else if (SN2I.lookup(member.sectionNameOrType, sectionIndex) &&
- !to_integer(member.sectionNameOrType, sectionIndex)) {
- WithColor::error() << "Unknown section referenced: '"
- << member.sectionNameOrType << "' at YAML section' "
- << Section.Name << "\n";
+ else if (!convertSectionIndex(SN2I, Section.Name, member.sectionNameOrType,
+ sectionIndex))
return false;
- }
SIdx = sectionIndex;
OS.write((const char *)&SIdx, sizeof(SIdx));
}
More information about the llvm-commits
mailing list