[llvm-readobj] - Refine the LLVM-style output to be consistent.

[grimar]

Summary

Our LLVM-style output was inconsistent.
This patch changes the output in the following way:

1. SHT_GNU_verdef { -> VersionDefinitions [
2. SHT_GNU_verneed { -> VersionRequirements [
3. Version symbols [ -> VersionSymbols [
4. EH_FRAME Header [ -> EHFrameHeader {

[jhenderson]

Did you remember to run LLD tests? I'd expect to see changes there...

tools/llvm-readobj/DwarfCFIEHPrinter.h

102 ↗

(On Diff #223834)

The data printed isn't a list, because it prints some metadata. I think this should be a dictionary too.

tools/llvm-readobj/ELFDumper.cpp

5128 ↗

(On Diff #223834)

I don't think the ElfHeader should be a ListScope: it's not a list, but a dictionary (unlike, say, symbols).

5598 ↗

(On Diff #223834)

Ditto, though I'm wondering here why the VersionSymbols data includes stuff to do with its section header? If it didn't have that stuff, it would be a list.

[grimar]

In D68636#1699479, @jhenderson wrote:

Did you remember to run LLD tests? I'd expect to see changes there...

Sure. That will be a separate change, once we agree with LLVM side.

[grimar]

tools/llvm-readobj/ELFDumper.cpp

5598 ↗

(On Diff #223834)

though I'm wondering here why the VersionSymbols data includes stuff to do with its section header?

I do not know. The same information is printed under "Sections [" tag anyways, so it is not useful probably:

Section {
  Index: 3
  Name: .gnu.version (30)
  Type: SHT_GNU_versym (0x6FFFFFFF)
  Flags [ (0x0)
  ]
  Address: 0x0
  Offset: 0xB4
  Size: 2
  Link: 0
  Info: 0
  AddressAlignment: 0
  EntrySize: 2
}

Should we remove "Section Name"/"Address"/"Offset"/"Link" and make it to be a list?

[jhenderson]

tools/llvm-readobj/ELFDumper.cpp

5598 ↗

(On Diff #223834)

I'd be inclined to do that personally, but it should be a separate change.

[MaskRay]

tools/llvm-readobj/ELFDumper.cpp

5598 ↗

(On Diff #223834)

The Linux Standard Base calls this "Symbol Version Table" but this is named "VersionSymbols" here... What do you think if we just use the regular section type name "SHT_GNU_versym"? It may improve discoverability as well.

[grimar]

• Addressed review comments.

[grimar]

tools/llvm-readobj/ELFDumper.cpp

5598 ↗

(On Diff #223834)

What do you think if we just use the regular section type name "SHT_GNU_versym"? It may improve discoverability as well.

I.e. this is an opposite direction to what this patch does:

SHT_GNU_verdef { -> VersionDefinitions [
SHT_GNU_verneed { -> VersionRequirements [

It will be only sections for which we use type names. Should we?

[jhenderson]

In D68636#1699484, @grimar wrote:

In D68636#1699479, @jhenderson wrote:

Did you remember to run LLD tests? I'd expect to see changes there...

Sure. That will be a separate change, once we agree with LLVM side.

Just to clarify, are you still using the SVN layout rather than the monorepo? Using the monorepo would allow having all the changes in the same patch.

Aside from the discussion on the titles of Version data, this looks good to me. I don't have a strong preference whichever way is used.

[grimar]

In D68636#1699712, @jhenderson wrote:

In D68636#1699484, @grimar wrote:

In D68636#1699479, @jhenderson wrote:

Did you remember to run LLD tests? I'd expect to see changes there...

Sure. That will be a separate change, once we agree with LLVM side.

Just to clarify, are you still using the SVN layout rather than the monorepo? Using the monorepo would allow having all the changes in the same patch.

Yes, I do not use monorepo yet. Going to switch soon as later this month svn will become readonly.

[MaskRay]

tools/llvm-readobj/ELFDumper.cpp

5598 ↗

(On Diff #223834)

I.e. this is an opposite direction to what this patch does:

Yes. .gnu.version is currently not consistent with .gnu.version_r and .gnu.version_d, and I know this patch tries to make them consistent.

I am not clear which direction we should go. I have a very weak preference for SHT_GNU_versym.

The naming does not seem very consistent here. While LSB names .gnu.version_r "version requirements", binutils-gdb elf.h names it "version needs section".

[rupprecht]

tools/llvm-readobj/ELFDumper.cpp

5598 ↗

(On Diff #223834)

Count me in the camp that (slightly) prefers seeing keys like "VersionDefinitions" rather than "SHT_GNU_verdef", though mostly on style grounds (not having a mix of CamelCase and SNAKE_CASE). However, I admit this is a bikeshed -- I think this patch (not D68704) will make things look nicer, but I have zero technical objections to it.

[grimar]

tools/llvm-readobj/ELFDumper.cpp

5598 ↗

(On Diff #223834)

OK. Actually D68704 contains 2 independent improvements/changes. Renaming "Version symbols {" -> "SHT_GNU_versym [" is one of them.
Another is removing of the fields and making the top tag to be a list scope instead of beeing a dictionary. It looks useful to me by itself.
I'll update it to remove the renaming and keep this one on hold to collect other possible opinions too.

[grimar]

Fangrui, so do you mean you are agree with the following renaming?

SHT_GNU_verdef { -> VersionDefinitions [
SHT_GNU_verneed { -> VersionRequirements

(this patch was in "planned changes" status and needs a rebasing, then some changes will go away I think,
but this renaming disagreement was the reason I've not update it. If it is OK for you,
I'll probably need to do one more update for it).

[MaskRay]

In D68636#1710892, @grimar wrote:

Fangrui, so do you mean you are agree with the following renaming?

SHT_GNU_verdef { -> VersionDefinitions [
SHT_GNU_verneed { -> VersionRequirements

(this patch was in "planned changes" status and needs a rebasing, then some changes will go away I think,
but this renaming disagreement was the reason I've not update it. If it is OK for you,
I'll probably need to do one more update for it).

Yes, I think the renaming is right (I was on a subway, so it was inconvenient for me to make more comments). I think I proposed a scheme that I don't like myself ;-) glibc names SHT_GNU_versym #define SHT_GNU_versym 0x6fffffff /* Version symbol table. */. It is totally fine to name it VersionSymbols here.

[grimar]

• Rebased.

llvm/test/Object/multiple-sections.yaml

 # RUN: yaml2obj %s -o %t.o
 # RUN: llvm-readobj -a --elf-cg-profile --addrsig %t.o | FileCheck %s
 
 # Test that multiple sections with the same type does not trigger an error.
 
 # CHECK: ElfHeader {
-# CHECK: SHT_GNU_verdef {
-# CHECK: SHT_GNU_verneed {
+# CHECK: VersionDefinitions [
+# CHECK: VersionRequirements [
 # CHECK: CGProfile [
 # CHECK: Addrsig [
 
 --- !ELF
 FileHeader:      
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_REL

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: EHFrameHeader {
+# LLVM-ALL: .eh_frame section at offset 0x1128 address 0x0:
 # LLVM-ALL: ProgramHeaders [
-# LLVM-ALL: Version symbols [
-# LLVM-ALL: SHT_GNU_verdef {
-# LLVM-ALL: SHT_GNU_verneed {
+# LLVM-ALL: VersionSymbols [
+# LLVM-ALL: VersionDefinitions [
+# LLVM-ALL: VersionRequirements [
 # 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
 
 # GNU-ALL: ELF Header:
 # GNU-ALL: There are {{.*}} section headers, starting at offset {{.*}}:
 # GNU-ALL: Relocation section '.rela.data' at offset {{.*}} contains {{.*}} entries:
 # GNU-ALL: Symbol table '.symtab' contains {{.*}} entries:
-# GNU-ALL: EH_FRAME Header [
+# GNU-ALL: EHFrameHeader {
 # GNU-ALL: .eh_frame section at offset {{.*}} address 0x0:
 # GNU-ALL: Dynamic section at offset {{.*}} contains {{.*}} entries:
 # GNU-ALL: Program Headers:
 # GNU-ALL: Version symbols section '.gnu.version' contains {{.*}} entries:
 # GNU-ALL: Version definition section '.gnu.version_d' contains {{.*}} entries:
 # GNU-ALL: Version needs section '.gnu.version_r' contains {{.*}} entries:
 # GNU-ALL: There are no section groups in this file.
 # GNU-ALL: Histogram for bucket list length (total of 1 buckets)

llvm/test/tools/llvm-readobj/elf-verneed-flags.yaml

 ## Check how llvm-readobj/llvm-readelf tools dump the flags of SHT_GNU_verneed
 ## section entries.
 
 # RUN: yaml2obj %s -o %t
 # RUN: llvm-readobj -V %t | FileCheck %s --check-prefix=LLVM-VERDEF
 # RUN: llvm-readelf -V %t | FileCheck %s --check-prefix=GNU-VERDEF
 
-# LLVM-VERDEF:      SHT_GNU_verneed {
+# LLVM-VERDEF:      VersionRequirements [
 # LLVM-VERDEF-NEXT:   Dependency {
 # LLVM-VERDEF-NEXT:     Version: 1
 # LLVM-VERDEF-NEXT:     Count: 6
 # LLVM-VERDEF-NEXT:     FileName: dso.so.0
 # LLVM-VERDEF-NEXT:     Entries [
 # LLVM-VERDEF-NEXT:       Entry {
 # LLVM-VERDEF-NEXT:         Hash: 0
 # LLVM-VERDEF-NEXT:         Flags: Base (0x1)

 # LLVM-VERDEF-NEXT:       Entry {
 # LLVM-VERDEF-NEXT:         Hash: 0
 # LLVM-VERDEF-NEXT:         Flags: 0xF
 # LLVM-VERDEF-NEXT:         Index: 0
 # LLVM-VERDEF-NEXT:         Name: all_and_unknown
 # LLVM-VERDEF-NEXT:       }
 # LLVM-VERDEF-NEXT:     ]
 # LLVM-VERDEF-NEXT:   }
-# LLVM-VERDEF-NEXT: }
+# LLVM-VERDEF-NEXT: ]
 
 # GNU-VERDEF:      Version needs section '.gnu.version_r' contains 1 entries:
 # GNU-VERDEF-NEXT:  Addr: 0000000000000000  Offset: 0x000200  Link: 6 (.dynstr)
 # GNU-VERDEF-NEXT:   0x0000: Version: 1  File: dso.so.0  Cnt: 6
 # GNU-VERDEF-NEXT:   0x0010:   Name: base  Flags: BASE  Version: 0
 # GNU-VERDEF-NEXT:   0x0020:   Name: weak  Flags: WEAK  Version: 0
 # GNU-VERDEF-NEXT:   0x0030:   Name: info  Flags: INFO  Version: 0
 # GNU-VERDEF-NEXT:   0x0040:   Name: all  Flags: BASE | WEAK | INFO  Version: 0

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:      VersionSymbols [
 # 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:     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: VersionDefinitions [
 # 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-NEXT:   Definition {
 # LLVM-NEXT:     Version: 1
 # LLVM-NEXT:     Flags: 0x0
 # LLVM-NEXT:     Index: 3
 # LLVM-NEXT:     Hash: 175630258
 # LLVM-NEXT:     Name: VERSION2
 # LLVM-NEXT:     Predecessor: VERSION1
 # LLVM-NEXT:   }
 # LLVM-NEXT:   Definition {
 # LLVM-NEXT:     Version: 1
 # LLVM-NEXT:     Flags: 0x0
 # LLVM-NEXT:     Index: 3
 # LLVM-NEXT:     Hash: 175630258
 # LLVM-NEXT:     Name: VERSION2
 # LLVM-NEXT:     Predecessor: VERSION1
 # LLVM-NEXT:   }
-# LLVM-NEXT: }
-# LLVM-NEXT: SHT_GNU_verneed {
+# LLVM-NEXT: ]
+# LLVM-NEXT: VersionRequirements [
 # LLVM-NEXT:   Dependency {
 # LLVM-NEXT:     Version: 1
 # LLVM-NEXT:     Count: 2
 # LLVM-NEXT:     FileName: verneed1.so.0
 # LLVM-NEXT:     Entries [
 # LLVM-NEXT:       Entry {
 # LLVM-NEXT:         Hash: 1938
 # LLVM-NEXT:         Flags: 0x0

 # LLVM-NEXT:       Entry {
 # LLVM-NEXT:         Hash: 1937
 # LLVM-NEXT:         Flags: 0x0
 # LLVM-NEXT:         Index: 6
 # LLVM-NEXT:         Name: v3
 # LLVM-NEXT:       }
 # LLVM-NEXT:     ]
 # LLVM-NEXT:   }
-# LLVM-NEXT: }
+# LLVM-NEXT: ]
 
 # GNU:      Version symbols section '.gnu.version' contains 6 entries:
 # GNU-NEXT:  Addr: 0000000000000000  Offset: 0x000040  Link: 7 (.dynsym)
 # GNU-NEXT:   000:   0 (*local*) 2 (VERSION1) 3 (VERSION2) 4 (v1)
 # GNU-NEXT:   004:   5 (v2)      6 (v3)
 # GNU-EMPTY:
 # GNU-NEXT: Version definition section '.gnu.version_d' contains 3 entries:
 # GNU-NEXT:  Addr: 0000000000000000  Offset: 0x00004c  Link: 8 (.dynstr)

llvm/test/tools/llvm-readobj/unwind.test

 # RUN: yaml2obj %s > %t.exe
 # RUN: llvm-readobj --unwind %t.exe | FileCheck %s
 
-# CHECK:      EH_FRAME Header [
+# CHECK:      EHFrameHeader {
 # CHECK-NEXT:  Address: 0x4013c0
 # CHECK-NEXT:  Offset: 0xbc
 # CHECK-NEXT:  Size: 0x3c
 # CHECK-NEXT:  Corresponding Section: .eh_frame_hdr
 # CHECK-NEXT:  Header {
 # CHECK-NEXT:    version: 1
 # CHECK-NEXT:    eh_frame_ptr_enc: 0x1b
 # CHECK-NEXT:    fde_count_enc: 0x3

 # CHECK-NEXT:      initial_location: 0x401250
 # CHECK-NEXT:      address: 0x4014c0
 # CHECK-NEXT:    }
 # CHECK-NEXT:    entry 5 {
 # CHECK-NEXT:      initial_location: 0x4012c0
 # CHECK-NEXT:      address: 0x4014f0
 # CHECK-NEXT:    }
 # CHECK-NEXT:  }
-# CHECK-NEXT:]
+# CHECK-NEXT:}
 
 # CHECK:      .eh_frame section at offset 0xf8 address 0x401400:
 # CHECK-NEXT:  [0x401400] CIE length=20
 # CHECK-NEXT:    version: 1
 # CHECK-NEXT:    augmentation: zR
 # CHECK-NEXT:    code_alignment_factor: 1
 # CHECK-NEXT:    data_alignment_factor: -8
 # CHECK-NEXT:    return_address_register: 16

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

 # RUN: yaml2obj %s -o %t
 # RUN: llvm-readobj -V %t | FileCheck %s
 
 # Check we are able to handle the SHT_GNU_verdef sections.
 
-# CHECK:      SHT_GNU_verdef {
+# CHECK:      VersionDefinitions [
 # CHECK-NEXT:   Definition {
 # CHECK-NEXT:     Version: 1
 # CHECK-NEXT:     Flags: Base
 # CHECK-NEXT:     Index: 1
 # CHECK-NEXT:     Hash: 170240160
 # CHECK-NEXT:     Name: dso.so.0
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Definition {
 # CHECK-NEXT:     Version: 1
 # CHECK-NEXT:     Flags: Weak
 # CHECK-NEXT:     Index: 2
 # CHECK-NEXT:     Hash: 108387921
 # CHECK-NEXT:     Name: VERSION_1
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Definition {
 # CHECK-NEXT:     Version: 1
 # CHECK-NEXT:     Flags: 0x3
 # CHECK-NEXT:     Index: 3
 # CHECK-NEXT:     Hash: 108387922
 # CHECK-NEXT:     Name: VERSION_2
 # CHECK-NEXT:     Predecessor: VERSION_3
 # CHECK-NEXT:   }
-# CHECK-NEXT: }
+# CHECK-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_DYN
   Machine:         EM_X86_64
   Entry:           0x0000000000001000

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

 # RUN: yaml2obj %s -o %t
 # RUN: llvm-readobj -V %t | FileCheck %s
 
 # Check we are able to handle the SHT_GNU_verneed sections.
 
-# CHECK:      SHT_GNU_verneed {
+# CHECK:      VersionRequirements [
 # CHECK-NEXT:   Dependency {
 # CHECK-NEXT:     Version: 1
 # CHECK-NEXT:     Count: 2
 # CHECK-NEXT:     FileName: dso.so.0
 # CHECK-NEXT:     Entries [
 # CHECK-NEXT:       Entry {
 # CHECK-NEXT:         Hash: 1937
 # CHECK-NEXT:         Flags: 0xA

 # CHECK-NEXT:       Entry {
 # CHECK-NEXT:         Hash: 1939
 # CHECK-NEXT:         Flags: 0xC
 # CHECK-NEXT:         Index: 2
 # CHECK-NEXT:         Name: v3
 # CHECK-NEXT:       }
 # CHECK-NEXT:     ]
 # CHECK-NEXT:   }
-# CHECK-NEXT: }
+# CHECK-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_EXEC
   Machine:         EM_X86_64
   Entry:           0x0000000000201000

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:      VersionSymbols [
 # 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: VersionDefinitions [
+# CHECK-NEXT: ]
+# CHECK-NEXT: VersionRequirements [
 # CHECK-NEXT:   Dependency {
 # CHECK-NEXT:     Version: 1
 # CHECK-NEXT:     Count: 2
 # CHECK-NEXT:     FileName: dso.so.0
 # CHECK-NEXT:     Entries [
 # CHECK-NEXT:       Entry {
 # CHECK-NEXT:         Hash: 1937
 # CHECK-NEXT:         Flags: 0x0
 # CHECK-NEXT:         Index: 3
 # CHECK-NEXT:         Name: v1
 # CHECK-NEXT:       }
 # CHECK-NEXT:       Entry {
 # CHECK-NEXT:         Hash: 1938
 # CHECK-NEXT:         Flags: 0x0
 # CHECK-NEXT:         Index: 4
 # CHECK-NEXT:         Name: v2
 # CHECK-NEXT:       }
 # CHECK-NEXT:     ]
 # CHECK-NEXT:   }
-# CHECK-NEXT: }
+# CHECK-NEXT: ]
 
 --- !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_EXEC
   Machine:         EM_X86_64
   Entry:           0x0000000000201000

llvm/tools/llvm-readobj/DwarfCFIEHPrinter.h

if (*SectionName == ".eh_frame")
       printEHFrame(&Shdr);
   }
 }
 
 template <typename ELFT>
 void PrinterContext<ELFT>::printEHFrameHdr(uint64_t EHFrameHdrOffset,
                                            uint64_t EHFrameHdrAddress,
                                            uint64_t EHFrameHdrSize) const {
-  ListScope L(W, "EH_FRAME Header");
+  DictScope L(W, "EHFrameHeader");
   W.startLine() << format("Address: 0x%" PRIx64 "\n", EHFrameHdrAddress);
   W.startLine() << format("Offset: 0x%" PRIx64 "\n", EHFrameHdrOffset);
   W.startLine() << format("Size: 0x%" PRIx64 "\n", EHFrameHdrSize);
 
   const object::ELFFile<ELFT> *Obj = ObjF->getELFFile();
   const auto *EHFrameHdrShdr = findSectionByAddress(ObjF, EHFrameHdrAddress);
   if (EHFrameHdrShdr) {
     auto SectionName = Obj->getSectionName(EHFrameHdrShdr);

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) {
-  ListScope SS(W, "Version symbols");
+  ListScope SS(W, "VersionSymbols");
   if (!Sec)
     return;
 
   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).
   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);
   }
 }
 
 template <class ELFT>
 void LLVMStyle<ELFT>::printVersionDefinitionSection(const ELFFile<ELFT> *Obj,
                                                     const Elf_Shdr *Sec) {
-  DictScope SD(W, "SHT_GNU_verdef");
+  ListScope SD(W, "VersionDefinitions");
   if (!Sec)
     return;
 
   const uint8_t *SecStartAddress =
       reinterpret_cast<const uint8_t *>(Obj->base() + Sec->sh_offset);
   const uint8_t *SecEndAddress = SecStartAddress + Sec->sh_size;
   const uint8_t *VerdefBuf = SecStartAddress;
   const Elf_Shdr *StrTab =
while (VerDefsNum--) {
     }
     VerdefBuf += Verdef->vd_next;
   }
 }
 
 template <class ELFT>
 void LLVMStyle<ELFT>::printVersionDependencySection(const ELFFile<ELFT> *Obj,
                                                     const Elf_Shdr *Sec) {
-  DictScope SD(W, "SHT_GNU_verneed");
+  ListScope SD(W, "VersionRequirements");
   if (!Sec)
     return;
 
   const uint8_t *SecData =
       reinterpret_cast<const uint8_t *>(Obj->base() + Sec->sh_offset);
   const Elf_Shdr *StrTab =
       unwrapOrError(this->FileName, Obj->getSection(Sec->sh_link));