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

[George Rimar via Phabricator via llvm-commits]

grimar created this revision.
grimar added a reviewer: jhenderson.
Herald added a subscriber: jakehehrlich.

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.


https://reviews.llvm.org/D63002

Files:
  tools/yaml2obj/yaml2elf.cpp


Index: tools/yaml2obj/yaml2elf.cpp
===================================================================
--- tools/yaml2obj/yaml2elf.cpp
+++ tools/yaml2obj/yaml2elf.cpp
@@ -178,19 +178,6 @@
                            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:
@@ -227,8 +214,8 @@
   // 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>
@@ -380,7 +367,7 @@
   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;
 
@@ -610,7 +597,7 @@
 
   // 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() &&


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D63002.203521.patch
Type: text/x-patch
Size: 2245 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190607/02aa693f/attachment.bin>