[llvm-readelf/obj] - Remove `tryGetSectionName` helper.

[grimar]

Summary

D91867 introduced the tryGetSectionName helper.
But we have getPrintableSectionName member with the similar
behavior which we can reuse. This patch does it.

[jhenderson]

I thought there was a function that did this already. Sorry, should have mentioned it in the previous review. LGTM.

[grimar]

In D91954#2411110, @jhenderson wrote:

I thought there was a function that did this already. Sorry, should have mentioned it in the previous review. LGTM.

I also thought we have one. But could not find it when wrote the patch for some reason and supposed that it was removed...

llvm/test/tools/llvm-readobj/ELF/groups.test

 
 # RUN: yaml2obj %s -DGROUP1SHNAME=0xAAAA -DTEXTBARSHNAME=0xBBBB -o %t.name.o
 # RUN: llvm-readobj --elf-section-groups %t.name.o 2>&1 | \
 # RUN:   FileCheck -DFILE=%t.name.o %s --check-prefix=NAME-LLVM --implicit-check-not=warning:
 # RUN: llvm-readelf --elf-section-groups %t.name.o 2>&1 | \
 # RUN:   FileCheck -DFILE=%t.name.o %s --check-prefix=NAME-GNU --implicit-check-not=warning:
 
 # NAME-LLVM:      Groups {
-# NAME-LLVM-NEXT: warning: '[[FILE]]': unable to get the name of the SHT_GROUP section with index 1: a section [index 1] has an invalid sh_name (0xaaaa) offset which goes past the end of the section name string table
-# NAME-LLVM-NEXT: warning: '[[FILE]]': unable to get the name of the SHT_PROGBITS section with index 5: a section [index 5] has an invalid sh_name (0xbbbb) offset which goes past the end of the section name string table
+# NAME-LLVM-NEXT: warning: '[[FILE]]': unable to get the name of SHT_GROUP section with index 1: a section [index 1] has an invalid sh_name (0xaaaa) offset which goes past the end of the section name string table
+# NAME-LLVM-NEXT: warning: '[[FILE]]': unable to get the name of SHT_PROGBITS section with index 5: a section [index 5] has an invalid sh_name (0xbbbb) offset which goes past the end of the section name string table
 # NAME-LLVM-NEXT:   Group {
 # NAME-LLVM-NEXT:     Name: <?> (43690)
 # NAME-LLVM-NEXT:     Index: 1
 # NAME-LLVM-NEXT:     Link: 7
 # NAME-LLVM-NEXT:     Info: 1
 # NAME-LLVM-NEXT:     Type: COMDAT (0x1)
 # NAME-LLVM-NEXT:     Signature: foo
 # NAME-LLVM-NEXT:     Section(s) in group [

 # NAME-LLVM-NEXT:     Signature: bar
 # NAME-LLVM-NEXT:     Section(s) in group [
 # NAME-LLVM-NEXT:       <?> (5)
 # NAME-LLVM-NEXT:       .rela.text.bar (6)
 # NAME-LLVM-NEXT:     ]
 # NAME-LLVM-NEXT:   }
 # NAME-LLVM-NEXT: }
 
-# NAME-GNU:        warning: '[[FILE]]': unable to get the name of the SHT_GROUP section with index 1: a section [index 1] has an invalid sh_name (0xaaaa) offset which goes past the end of the section name string table
-# NAME-GNU-NEXT:   warning: '[[FILE]]': unable to get the name of the SHT_PROGBITS section with index 5: a section [index 5] has an invalid sh_name (0xbbbb) offset which goes past the end of the section name string table
+# NAME-GNU:        warning: '[[FILE]]': unable to get the name of SHT_GROUP section with index 1: a section [index 1] has an invalid sh_name (0xaaaa) offset which goes past the end of the section name string table
+# NAME-GNU-NEXT:   warning: '[[FILE]]': unable to get the name of SHT_PROGBITS section with index 5: a section [index 5] has an invalid sh_name (0xbbbb) offset which goes past the end of the section name string table
 # NAME-GNU-EMPTY:
 # NAME-GNU-NEXT:   COMDAT group section [    1] `<?>' [foo] contains 2 sections:
 # NAME-GNU-NEXT:      [Index]    Name
 # NAME-GNU-NEXT:      [    3]   .text.foo
 # NAME-GNU-NEXT:      [    4]   .rela.text.foo
 # NAME-GNU-EMPTY:
 # NAME-GNU-NEXT:  COMDAT group section [    2] `.group1' [bar] contains 2 sections:
 # NAME-GNU-NEXT:     [Index]    Name

llvm/tools/llvm-readobj/ELFDumper.cpp

template <class ELFT> void GNUStyle<ELFT>::printFileHeaders() {
   Str = to_string(e.e_shentsize) + " (bytes)";
   printFields(OS, "Size of section headers:", Str);
   Str = getSectionHeadersNumString(this->Obj, this->FileName);
   printFields(OS, "Number of section headers:", Str);
   Str = getSectionHeaderTableIndexString(this->Obj, this->FileName);
   printFields(OS, "Section header string table index:", Str);
 }
 
-template <class ELFT>
-static StringRef tryGetSectionName(const ELFFile<ELFT> &Obj,
-                                   const typename ELFT::Shdr &Sec,
-                                   DumpStyle<ELFT> &Dump) {
-  if (Expected<StringRef> SecNameOrErr = Obj.getSectionName(Sec))
-    return *SecNameOrErr;
-  else
-    Dump.reportUniqueWarning(createError("unable to get the name of the " +
-                                         describe(Obj, Sec) + ": " +
-                                         toString(SecNameOrErr.takeError())));
-  return "<?>";
-}
-
 template <class ELFT> std::vector<GroupSection> DumpStyle<ELFT>::getGroups() {
   auto GetSignature = [&](const Elf_Sym &Sym, unsigned SymNdx,
                           const Elf_Shdr &Symtab) -> StringRef {
     Expected<StringRef> StrTableOrErr = Obj.getStringTableForSymtab(Symtab);
     if (!StrTableOrErr) {
       reportUniqueWarning(createError("unable to get the string table for " +
                                       describe(Obj, Symtab) + ": " +
                                       toString(StrTableOrErr.takeError())));
if (Expected<ArrayRef<Elf_Word>> ContentsOrErr =
       else
         Data = *ContentsOrErr;
     } else {
       reportUniqueWarning(createError("unable to get the content of the " +
                                       describe(Obj, Sec) + ": " +
                                       toString(ContentsOrErr.takeError())));
     }
 
-    Ret.push_back({tryGetSectionName(Obj, Sec, *this),
+    Ret.push_back({getPrintableSectionName(Sec),
                    maybeDemangle(Signature),
                    Sec.sh_name,
                    I - 1,
                    Sec.sh_link,
                    Sec.sh_info,
                    Data.empty() ? Elf_Word(0) : Data[0],
                    {}});
 
     if (Data.empty())
       continue;
 
     std::vector<GroupMember> &GM = Ret.back().Members;
     for (uint32_t Ndx : Data.slice(1)) {
       if (Expected<const Elf_Shdr *> SecOrErr = Obj.getSection(Ndx)) {
-        GM.push_back({tryGetSectionName(Obj, **SecOrErr, *this), Ndx});
+        GM.push_back({getPrintableSectionName(**SecOrErr), Ndx});
       } else {
         reportUniqueWarning(
             createError("unable to get the section with index " + Twine(Ndx) +
                         " when dumping the " + describe(Obj, Sec) + ": " +
                         toString(SecOrErr.takeError())));
         GM.push_back({"<?>", Ndx});
       }
     }