[yaml2obj] - Remove helper methods that are probably excessive. NFC.

[grimar]

Summary

These methods are used only once. One of them is not used at all.
I see no much sence to have them, I think code is more readable
without them.

[grimar]

tools/yaml2obj/yaml2elf.cpp

192 ↗

(On Diff #203521)

Perhaps we can keep the getSectionCount() though.

[jhenderson]

LGTM. I don't think we need the section count one, since we only use it once, and the context is pretty clear.

llvm/trunk/tools/yaml2obj/yaml2elf.cpp

class ELFState {
   bool writeSectionContent(Elf_Shdr &SHeader,
                            const ELFYAML::MipsABIFlags &Section,
                            ContiguousBlobAccumulator &CBA);
   bool writeSectionContent(Elf_Shdr &SHeader,
                            const ELFYAML::DynamicSection &Section,
                            ContiguousBlobAccumulator &CBA);
   std::vector<StringRef> implicitSectionNames() const;
 
-  // - SHT_NULL entry (placed first, i.e. 0'th entry)
-  // - symbol table (.symtab) (defaults to after last yaml section)
-  // - string table (.strtab) (defaults to after .symtab)
-  // - section header string table (.shstrtab) (defaults to after .strtab)
-  // - dynamic symbol table (.dynsym) (defaults to after .shstrtab)
-  // - dynamic string table (.dynstr) (defaults to after .dynsym)
-  unsigned getDotSymTabSecNo() const { return SN2I.get(".symtab"); }
-  unsigned getDotStrTabSecNo() const { return SN2I.get(".strtab"); }
-  unsigned getDotShStrTabSecNo() const { return SN2I.get(".shstrtab"); }
-  unsigned getDotDynSymSecNo() const { return SN2I.get(".dynsym"); }
-  unsigned getDotDynStrSecNo() const { return SN2I.get(".dynstr"); }
-  unsigned getSectionCount() const { return SN2I.size() + 1; }
-
   ELFState(const ELFYAML::Object &D) : Doc(D) {}
 
 public:
   static int writeELF(raw_ostream &OS, const ELFYAML::Object &Doc);
 
 private:
   void finalizeStrings();
 };
void ELFState<ELFT>::initELFHeader(Elf_Ehdr &Header) {
   Header.e_flags = Doc.Header.Flags;
   Header.e_ehsize = sizeof(Elf_Ehdr);
   Header.e_phentsize = sizeof(Elf_Phdr);
   Header.e_phnum = Doc.ProgramHeaders.size();
   Header.e_shentsize = sizeof(Elf_Shdr);
   // Immediately following the ELF header and program headers.
   Header.e_shoff =
       sizeof(Header) + sizeof(Elf_Phdr) * Doc.ProgramHeaders.size();
-  Header.e_shnum = getSectionCount();
-  Header.e_shstrndx = getDotShStrTabSecNo();
+  Header.e_shnum = SN2I.size() + 1;
+  Header.e_shstrndx = SN2I.get(".shstrtab");
 }
 
 template <class ELFT>
 void ELFState<ELFT>::initProgramHeaders(std::vector<Elf_Phdr> &PHeaders) {
   for (const auto &YamlPhdr : Doc.ProgramHeaders) {
     Elf_Phdr Phdr;
     Phdr.p_type = YamlPhdr.Type;
     Phdr.p_flags = YamlPhdr.Flags;

 void ELFState<ELFT>::initSymtabSectionHeader(Elf_Shdr &SHeader,
                                              SymtabType STType,
                                              ContiguousBlobAccumulator &CBA,
                                              ELFYAML::Section *YAMLSec) {
   zero(SHeader);
   bool IsStatic = STType == SymtabType::Static;
   SHeader.sh_name = DotShStrtab.getOffset(IsStatic ? ".symtab" : ".dynsym");
   SHeader.sh_type = IsStatic ? ELF::SHT_SYMTAB : ELF::SHT_DYNSYM;
-  SHeader.sh_link = IsStatic ? getDotStrTabSecNo() : getDotDynStrSecNo();
+  SHeader.sh_link = IsStatic ? SN2I.get(".strtab") : SN2I.get(".dynstr");
   if (!IsStatic)
     SHeader.sh_flags |= ELF::SHF_ALLOC;
 
   // One greater than symbol table index of the last local symbol.
   const auto &Symbols = IsStatic ? Doc.Symbols : Doc.DynamicSymbols;
 
   // If the symbol table section is explicitly described in the YAML
   // then we should set the fields requested.
assert((Section.Type == llvm::ELF::SHT_REL ||
          "Section type is not SHT_REL nor SHT_RELA");
 
   bool IsRela = Section.Type == llvm::ELF::SHT_RELA;
   SHeader.sh_entsize = IsRela ? sizeof(Elf_Rela) : sizeof(Elf_Rel);
   SHeader.sh_size = SHeader.sh_entsize * Section.Relocations.size();
 
   // For relocation section set link to .symtab by default.
   if (Section.Link.empty())
-    SHeader.sh_link = getDotSymTabSecNo();
+    SHeader.sh_link = SN2I.get(".symtab");
 
   unsigned Index = 0;
   if (!Section.RelocatableSec.empty() &&
       !convertSectionIndex(SN2I, Section.Name, Section.RelocatableSec, Index))
     return false;
   SHeader.sh_info = Index;
 
   auto &OS = CBA.getOSAndAlignedOffset(SHeader.sh_offset, SHeader.sh_addralign);