From c8c53836a765b3f04e0ff686d1b6741d3d33b4fd Mon Sep 17 00:00:00 2001 From: George Rimar Date: Fri, 26 Apr 2019 13:09:11 +0000 Subject: [PATCH] [yaml2obj] - Make implicitSectionNames() return std::vector. NFCI. No need to use SmallVector of char* here. This simplifies the code. llvm-svn: 359301 --- tools/yaml2obj/yaml2elf.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/yaml2obj/yaml2elf.cpp b/tools/yaml2obj/yaml2elf.cpp index bb5ca4ce86a..1f83656a606 100644 --- a/tools/yaml2obj/yaml2elf.cpp +++ b/tools/yaml2obj/yaml2elf.cpp @@ -170,7 +170,7 @@ class ELFState { bool writeSectionContent(Elf_Shdr &SHeader, const ELFYAML::DynamicSection &Section, ContiguousBlobAccumulator &CBA); - SmallVector implicitSectionNames() const; + std::vector implicitSectionNames() const; // - SHT_NULL entry (placed first, i.e. 0'th entry) // - symbol table (.symtab) (defaults to after last yaml section) @@ -792,7 +792,7 @@ template bool ELFState::buildSectionIndex() { auto SecNo = 1 + Doc.Sections.size(); // Add special sections after input sections, if necessary. - for (const auto &Name : implicitSectionNames()) + for (StringRef Name : implicitSectionNames()) if (!SN2I.addName(Name, SecNo)) { // Account for this section, since it wasn't in the Doc ++SecNo; @@ -894,7 +894,7 @@ int ELFState::writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) { return 1; // Populate SHeaders with implicit sections not present in the Doc - for (const auto &Name : State.implicitSectionNames()) + for (StringRef Name : State.implicitSectionNames()) if (State.SN2I.get(Name) >= SHeaders.size()) SHeaders.push_back({}); @@ -925,7 +925,7 @@ int ELFState::writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) { } template -SmallVector ELFState::implicitSectionNames() const { +std::vector ELFState::implicitSectionNames() const { if (Doc.DynamicSymbols.empty()) return {".symtab", ".strtab", ".shstrtab"}; return {".symtab", ".strtab", ".shstrtab", ".dynsym", ".dynstr"};