[llvm-readobj] Should declare `ListScope` for `verneed` entries.

[Higuoxing]

Summary

YAML mappings require keys to be unique. See: https://yaml.org/spec/1.2/spec.html#id2764652

[ruiu]

Looks like this is a correct patch, as YAML requires map keys to be unique (https://yaml.org/spec/1.2/spec.html#id2764652)

[ruiu]

Can you mention that in the commit message?

[Higuoxing]

In D60438#1459144, @ruiu wrote:

Can you mention that in the commit message?

Sure, thanks a lot.

[Higuoxing]

Addressed @ruiu 's comments.

• Add commit message.

[ruiu]

LGTM

lld/test/ELF/verdef-defaultver.s

 # EXE-NEXT:  }
 # EXE-NEXT:  SHT_GNU_verdef {
 # EXE-NEXT:  }
 # EXE-NEXT:  SHT_GNU_verneed {
 # EXE-NEXT:    Dependency {
 # EXE-NEXT:      Version: 1
 # EXE-NEXT:      Count: 2
 # EXE-NEXT:      FileName: shared
-# EXE-NEXT:      Entry {
-# EXE-NEXT:        Hash: 1425
-# EXE-NEXT:        Flags: 0x0
-# EXE-NEXT:        Index: 2
-# EXE-NEXT:        Name: V1
-# EXE-NEXT:      }
-# EXE-NEXT:      Entry {
-# EXE-NEXT:        Hash: 1426
-# EXE-NEXT:        Flags: 0x0
-# EXE-NEXT:        Index: 3
-# EXE-NEXT:        Name: V2
-# EXE-NEXT:      }
+# EXE-NEXT:      Entries [
+# EXE-NEXT:        Entry {
+# EXE-NEXT:          Hash: 1425
+# EXE-NEXT:          Flags: 0x0
+# EXE-NEXT:          Index: 2
+# EXE-NEXT:          Name: V1
+# EXE-NEXT:        }
+# EXE-NEXT:        Entry {
+# EXE-NEXT:          Hash: 1426
+# EXE-NEXT:          Flags: 0x0
+# EXE-NEXT:          Index: 3
+# EXE-NEXT:          Name: V2
+# EXE-NEXT:        }
+# EXE-NEXT:      ]
 # EXE-NEXT:    }
 # EXE-NEXT:  }
 
 .globl _start
 _start:
   .long a - .
   .long b - .
   .long c - .

lld/test/ELF/verneed.s

 # 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: verneed1.so.0
-# CHECK-NEXT:      Entry {
-# CHECK-NEXT:        Hash: 1938
-# CHECK-NEXT:        Flags: 0x0
-# CHECK-NEXT:        Index: 3
-# CHECK-NEXT:        Name: v2
-# CHECK-NEXT:      }
-# CHECK-NEXT:      Entry {
-# CHECK-NEXT:        Hash: 1939
-# CHECK-NEXT:        Flags: 0x0
-# CHECK-NEXT:        Index: 2
-# CHECK-NEXT:        Name: v3
-# CHECK-NEXT:      }
+# CHECK-NEXT:      Entries [
+# CHECK-NEXT:        Entry {
+# CHECK-NEXT:          Hash: 1938
+# CHECK-NEXT:          Flags: 0x0
+# CHECK-NEXT:          Index: 3
+# CHECK-NEXT:          Name: v2
+# CHECK-NEXT:        }
+# CHECK-NEXT:        Entry {
+# CHECK-NEXT:          Hash: 1939
+# CHECK-NEXT:          Flags: 0x0
+# CHECK-NEXT:          Index: 2
+# CHECK-NEXT:          Name: v3
+# CHECK-NEXT:        }
+# CHECK-NEXT:      ]
 # CHECK-NEXT:    }
 # CHECK-NEXT:    Dependency {
 # CHECK-NEXT:      Version: 1
 # CHECK-NEXT:      Count: 1
 # CHECK-NEXT:      FileName: verneed2.so.0
-# CHECK-NEXT:      Entry {
-# CHECK-NEXT:        Hash: 1937
-# CHECK-NEXT:        Flags: 0x0
-# CHECK-NEXT:        Index: 4
-# CHECK-NEXT:        Name: v1
-# CHECK-NEXT:      }
+# CHECK-NEXT:      Entries [
+# CHECK-NEXT:        Entry {
+# CHECK-NEXT:          Hash: 1937
+# CHECK-NEXT:          Flags: 0x0
+# CHECK-NEXT:          Index: 4
+# CHECK-NEXT:          Name: v1
+# CHECK-NEXT:        }
+# CHECK-NEXT:      ]
 # CHECK-NEXT:    }
 # CHECK-NEXT:  }
 
 .globl _start
 _start:
 call f1@plt
 call f2@plt
 call g1@plt

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

 RUN: llvm-readobj -V %p/Inputs/verneed.elf-x86-64 | FileCheck %s --check-prefix=LLVM-VERNEED
 RUN: llvm-readelf -V %p/Inputs/verneed.elf-x86-64 | FileCheck %s --check-prefix=GNU-VERNEED
 
 LLVM-VERNEED:       SHT_GNU_verneed {
 LLVM-VERNEED-NEXT:   Dependency {
 LLVM-VERNEED-NEXT:     Version: 1
 LLVM-VERNEED-NEXT:     Count: 2
 LLVM-VERNEED-NEXT:     FileName: verneed1.so.0
-LLVM-VERNEED-NEXT:     Entry {
-LLVM-VERNEED-NEXT:       Hash: 1938
-LLVM-VERNEED-NEXT:       Flags: 0x0
-LLVM-VERNEED-NEXT:       Index: 3
-LLVM-VERNEED-NEXT:       Name: v2
-LLVM-VERNEED-NEXT:     }
-LLVM-VERNEED-NEXT:     Entry {
-LLVM-VERNEED-NEXT:       Hash: 1939
-LLVM-VERNEED-NEXT:       Flags: 0x0
-LLVM-VERNEED-NEXT:       Index: 2
-LLVM-VERNEED-NEXT:       Name: v3
-LLVM-VERNEED-NEXT:     }
+LLVM-VERNEED-NEXT:     Entries [
+LLVM-VERNEED-NEXT:       Entry {
+LLVM-VERNEED-NEXT:         Hash: 1938
+LLVM-VERNEED-NEXT:         Flags: 0x0
+LLVM-VERNEED-NEXT:         Index: 3
+LLVM-VERNEED-NEXT:         Name: v2
+LLVM-VERNEED-NEXT:       }
+LLVM-VERNEED-NEXT:       Entry {
+LLVM-VERNEED-NEXT:         Hash: 1939
+LLVM-VERNEED-NEXT:         Flags: 0x0
+LLVM-VERNEED-NEXT:         Index: 2
+LLVM-VERNEED-NEXT:         Name: v3
+LLVM-VERNEED-NEXT:       }
+LLVM-VERNEED-NEXT:     ]
 LLVM-VERNEED-NEXT:   }
 LLVM-VERNEED-NEXT:   Dependency {
 LLVM-VERNEED-NEXT:     Version: 1
 LLVM-VERNEED-NEXT:     Count: 1
 LLVM-VERNEED-NEXT:     FileName: verneed2.so.0
-LLVM-VERNEED-NEXT:     Entry {
-LLVM-VERNEED-NEXT:       Hash: 1937
-LLVM-VERNEED-NEXT:       Flags: 0x0
-LLVM-VERNEED-NEXT:       Index: 4
-LLVM-VERNEED-NEXT:       Name: v1
-LLVM-VERNEED-NEXT:     }
+LLVM-VERNEED-NEXT:     Entries [
+LLVM-VERNEED-NEXT:       Entry {
+LLVM-VERNEED-NEXT:         Hash: 1937
+LLVM-VERNEED-NEXT:         Flags: 0x0
+LLVM-VERNEED-NEXT:         Index: 4
+LLVM-VERNEED-NEXT:         Name: v1
+LLVM-VERNEED-NEXT:       }
+LLVM-VERNEED-NEXT:     ]
 LLVM-VERNEED-NEXT:   }
 LLVM-VERNEED-NEXT: }
 
 GNU-VERNEED:      Version symbols section '.gnu.version' contains 4 entries:
 GNU-VERNEED-NEXT:  Addr: 0000000000010228  Offset: 0x000228  Link: 1 (.dynsym)
 GNU-VERNEED-NEXT:   000:   0 (*local*)       2 (v3)            3 (v2)            4 (v1)
 
 GNU-VERNEED: Dumper for .gnu.version_r is not implemented
 

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

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

 # 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:     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:     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: }
 
 --- !ELF
 FileHeader:
   Class:           ELFCLASS64
   Data:            ELFDATA2LSB
   Type:            ET_EXEC

llvm/tools/llvm-readobj/ELFDumper.cpp

for (unsigned I = 0; I < VerneedNum; ++I) {
     DictScope Entry(W, "Dependency");
     W.printNumber("Version", Verneed->vn_version);
     W.printNumber("Count", Verneed->vn_cnt);
     W.printString("FileName",
                   StringRef(reinterpret_cast<const char *>(
                       Obj->base() + StrTab->sh_offset + Verneed->vn_file)));
 
     const uint8_t *VernauxBuf = VerneedBuf + Verneed->vn_aux;
+    ListScope L(W, "Entries");
     for (unsigned J = 0; J < Verneed->vn_cnt; ++J) {
       const Elf_Vernaux *Vernaux =
           reinterpret_cast<const Elf_Vernaux *>(VernauxBuf);
       DictScope Entry(W, "Entry");
       W.printNumber("Hash", Vernaux->vna_hash);
       W.printEnum("Flags", Vernaux->vna_flags, makeArrayRef(SymVersionFlags));
       W.printNumber("Index", Vernaux->vna_other);
       W.printString("Name",