[llvm-readobj] - Remove excessive fields when dumping "Version symbols".

[grimar]

Summary

This removes a few fields that are not useful:
"Section Name", "Address", "Offset" and "Link"
(they duplicated the information available under
the "Sections [" tag).

[grimar]

Going to remove renaming part.

[MaskRay]

And removes few fields that are not useful:

"Section Name", "Address", "Ofsset" and "Link"

Typo: Ofsset.

This part looks good.

[grimar]

• Addressed review comments.
• Removed a tag renaming change from this patch.

llvm/test/tools/llvm-readobj/all.test

 # RUN: yaml2obj %s -o %t.o
 # RUN: llvm-readobj -a %t.o | FileCheck %s --check-prefix LLVM-ALL
 # RUN: llvm-readobj --all %t.o | FileCheck %s --check-prefix LLVM-ALL
 
 # LLVM-ALL: Format: ELF32-i386
 # LLVM-ALL: Arch: i386
 # LLVM-ALL: AddressSize: 32bit
 # LLVM-ALL: LoadName:
 # LLVM-ALL: ElfHeader {
 # LLVM-ALL: Sections [
 # LLVM-ALL: Relocations [
 # LLVM-ALL: Symbols [
 # LLVM-ALL: ProgramHeaders [
-# LLVM-ALL: Version symbols {
+# LLVM-ALL: Version symbols [
 # LLVM-ALL: SHT_GNU_verdef {
 # LLVM-ALL: SHT_GNU_verneed {
 # LLVM-ALL: Addrsig [
 # LLVM-ALL: Notes [
 # LLVM-ALL: StackSizes [
 
 # RUN: llvm-readelf -a %t.o | FileCheck %s --check-prefix GNU-ALL
 # RUN: llvm-readelf --all %t.o | FileCheck %s --check-prefix GNU-ALL

llvm/test/tools/llvm-readobj/elf-versioninfo.test

DynamicSymbols:
   - Name:            sym3
     Binding:         STB_GLOBAL
   - Name:            sym4
     Binding:         STB_GLOBAL
   - Name:            sym5
     Binding:         STB_GLOBAL
 ...
 
-# LLVM:      Version symbols {
-# LLVM-NEXT:   Section Name: .gnu.version
-# LLVM-NEXT:   Address: 0x0
-# LLVM-NEXT:   Offset: 0x40
-# LLVM-NEXT:   Link: 7
-# LLVM-NEXT:   Symbols [
-# LLVM-NEXT:     Symbol {
-# LLVM-NEXT:       Version: 0
-# LLVM-NEXT:       Name:
-# LLVM-NEXT:     }
-# LLVM-NEXT:     Symbol {
-# LLVM-NEXT:       Version: 2
-# LLVM-NEXT:       Name: sym1@@VERSION1
-# LLVM-NEXT:     }
-# LLVM-NEXT:     Symbol {
-# LLVM-NEXT:       Version: 3
-# LLVM-NEXT:       Name: sym2@@VERSION2
-# LLVM-NEXT:     }
-# LLVM-NEXT:     Symbol {
-# LLVM-NEXT:       Version: 4
-# LLVM-NEXT:       Name: sym3@v1
-# LLVM-NEXT:     }
-# LLVM-NEXT:     Symbol {
-# LLVM-NEXT:       Version: 5
-# LLVM-NEXT:       Name: sym4@v2
-# LLVM-NEXT:     }
-# LLVM-NEXT:     Symbol {
-# LLVM-NEXT:       Version: 6
-# LLVM-NEXT:       Name: sym5@v3
-# LLVM-NEXT:     }
-# LLVM-NEXT:   ]
-# LLVM-NEXT: }
+# LLVM:      Version symbols [
+# LLVM-NEXT:   Symbol {
+# LLVM-NEXT:     Version: 0
+# LLVM-NEXT:     Name:
+# LLVM-NEXT:   }
+# LLVM-NEXT:   Symbol {
+# LLVM-NEXT:     Version: 2
+# LLVM-NEXT:     Name: sym1@@VERSION1
+# LLVM-NEXT:   }
+# LLVM-NEXT:   Symbol {
+# LLVM-NEXT:     Version: 3
+# LLVM-NEXT:     Name: sym2@@VERSION2
+# LLVM-NEXT:   }
+# LLVM-NEXT:   Symbol {
+# LLVM-NEXT:     Version: 4
+# LLVM-NEXT:     Name: sym3@v1
+# LLVM-NEXT:   }
+# LLVM-NEXT:   Symbol {
+# LLVM-NEXT:     Version: 5
+# LLVM-NEXT:     Name: sym4@v2
+# LLVM-NEXT:   }
+# LLVM-NEXT:   Symbol {
+# LLVM-NEXT:     Version: 6
+# LLVM-NEXT:     Name: sym5@v3
+# LLVM-NEXT:   }
+# LLVM-NEXT: ]
 # LLVM-NEXT: SHT_GNU_verdef {
 # LLVM-NEXT:   Definition {
 # LLVM-NEXT:     Version: 1
 # LLVM-NEXT:     Flags: 0x0
 # LLVM-NEXT:     Index: 2
 # LLVM-NEXT:     Hash: 175630257
 # LLVM-NEXT:     Name: VERSION1
 # LLVM-NEXT:   }

llvm/test/tools/yaml2obj/versym-section.yaml

 ## Check we are able to produce a valid SHT_GNU_versym
 ## section from its description.
 
 # RUN: yaml2obj --docnum=1 %s -o %t1
 # RUN: llvm-readobj -V %t1 | FileCheck %s
 
-# CHECK:      Version symbols {
-# CHECK-NEXT:   Section Name: .gnu.version
-# CHECK-NEXT:   Address: 0x200210
-# CHECK-NEXT:   Offset: 0x40
-# CHECK-NEXT:   Link: 6
-# CHECK-NEXT:   Symbols [
-# CHECK-NEXT:     Symbol {
-# CHECK-NEXT:       Version: 0
-# CHECK-NEXT:       Name:
-# CHECK-NEXT:     }
-# CHECK-NEXT:     Symbol {
-# CHECK-NEXT:       Version: 3
-# CHECK-NEXT:       Name: f1@v1
-# CHECK-NEXT:     }
-# CHECK-NEXT:     Symbol {
-# CHECK-NEXT:       Version: 4
-# CHECK-NEXT:       Name: f2@v2
-# CHECK-NEXT:     }
-# CHECK-NEXT:   ]
-# CHECK-NEXT: }
+# CHECK:      Version symbols [
+# CHECK-NEXT:   Symbol {
+# CHECK-NEXT:     Version: 0
+# CHECK-NEXT:     Name:
+# CHECK-NEXT:   }
+# CHECK-NEXT:   Symbol {
+# CHECK-NEXT:     Version: 3
+# CHECK-NEXT:     Name: f1@v1
+# CHECK-NEXT:   }
+# CHECK-NEXT:   Symbol {
+# CHECK-NEXT:     Version: 4
+# CHECK-NEXT:     Name: f2@v2
+# CHECK-NEXT:   }
+# CHECK-NEXT: ]
 # CHECK-NEXT: SHT_GNU_verdef {
 # CHECK-NEXT: }
 # CHECK-NEXT: SHT_GNU_verneed {
 # CHECK-NEXT:   Dependency {
 # CHECK-NEXT:     Version: 1
 # CHECK-NEXT:     Count: 2
 # CHECK-NEXT:     FileName: dso.so.0
 # CHECK-NEXT:     Entries [

llvm/tools/llvm-readobj/ELFDumper.cpp

for (const Elf_Phdr &Phdr :
     W.printFlags("Flags", Phdr.p_flags, makeArrayRef(ElfSegmentFlags));
     W.printNumber("Alignment", Phdr.p_align);
   }
 }
 
 template <class ELFT>
 void LLVMStyle<ELFT>::printVersionSymbolSection(const ELFFile<ELFT> *Obj,
                                                 const Elf_Shdr *Sec) {
-  DictScope SS(W, "Version symbols");
+  ListScope SS(W, "Version symbols");
   if (!Sec)
     return;
 
-  StringRef SecName = unwrapOrError(this->FileName, Obj->getSectionName(Sec));
-  W.printNumber("Section Name", SecName, Sec->sh_name);
-  W.printHex("Address", Sec->sh_addr);
-  W.printHex("Offset", Sec->sh_offset);
-  W.printNumber("Link", Sec->sh_link);
-
   const uint8_t *VersymBuf =
       reinterpret_cast<const uint8_t *>(Obj->base() + Sec->sh_offset);
   const ELFDumper<ELFT> *Dumper = this->dumper();
   StringRef StrTable = Dumper->getDynamicStringTable();
 
   // Same number of entries in the dynamic symbol table (DT_SYMTAB).
-  ListScope Syms(W, "Symbols");
   for (const Elf_Sym &Sym : Dumper->dynamic_symbols()) {
     DictScope S(W, "Symbol");
     const Elf_Versym *Versym = reinterpret_cast<const Elf_Versym *>(VersymBuf);
     std::string FullSymbolName =
         Dumper->getFullSymbolName(&Sym, StrTable, true /* IsDynamic */);
     W.printNumber("Version", Versym->vs_index & VERSYM_VERSION);
     W.printString("Name", FullSymbolName);
     VersymBuf += sizeof(Elf_Versym);