[libObject,llvm-readelf/obj] - Don't use @@ when printing versions of undefined symbols.

[grimar]

Summary

A default version (@@) is only available for defined symbols.
Here is a corresponding code from GNU readelf:

  if (sym_info == symbol_undefined)
    printf ("@%s (%d)", version_string, vna_other);
  else
    printf (sym_info == symbol_hidden ? "@%s" : "@@%s",
	    version_string);

Currently we use "@@" for undefined symbols too.
This patch fixes the issue and improves our test case.

[jhenderson]

As noted elsewhere, I'm not really familiar with symbol versioning, so it would be better if @MaskRay looked at this.

llvm/tools/llvm-readobj/ELFDumper.cpp

773–775

Why not return directly as it did before?

[grimar]

• Addressed review comment.

@MaskRay, are you OK with it? D94912 depends on this.

[MaskRay]

Thanks!

lld/test/ELF/partition-synthetic-sections.s

 // PART0-NEXT: 0x0000000000000000 (NULL)               0x0
 
 // CHECK: Relocation section '.rela.dyn'
 // CHECK-NEXT: Offset
 // PART0-NEXT: 000000000000[[DATA_SEGMENT]]178 {{.*}} R_X86_64_64 {{.*}} f1@v3 + 0
 // PART0-NEXT: {{0*}}[[INIT_ARRAY_ADDR]]       {{.*}} R_X86_64_64 {{.*}} p0@@x1 + 0
 // PART1-NEXT: 000000000000[[DATA_SEGMENT]]148 {{.*}} R_X86_64_RELATIVE 3178
 // PART1-NEXT: 000000000000[[DATA_SEGMENT]]130 {{.*}} R_X86_64_64 {{.*}} f2@v2 + 0
-// PART1-NEXT: 000000000000[[DATA_SEGMENT]]138 {{.*}} R_X86_64_64 {{.*}} p0@@x1 + 0
-// PART1-NEXT: 000000000000[[DATA_SEGMENT]]140 {{.*}} R_X86_64_64 {{.*}} p0@@x1 + 0
+// PART1-NEXT: 000000000000[[DATA_SEGMENT]]138 {{.*}} R_X86_64_64 {{.*}} p0@x1 + 0
+// PART1-NEXT: 000000000000[[DATA_SEGMENT]]140 {{.*}} R_X86_64_64 {{.*}} p0@x1 + 0
 
 // PART0: Relocation section '.rela.plt'
 // PART0-NEXT: Offset
 // PART0-NEXT: 000000000000[[DATA_SEGMENT]]198 {{.*}} R_X86_64_JUMP_SLOT {{.*}} f1@v3 + 0
 // PART0-NEXT: 000000000000[[DATA_SEGMENT]]1a0 {{.*}} R_X86_64_JUMP_SLOT {{.*}} f2@v2 + 0
 
 // CHECK-NEXT: EHFrameHeader
 // CHECK: Address: 0x[[EH_FRAME_HDR_ADDR]]

 // CHECK-NOT: FDE
 // CHECK: CIE length=0
 
 // CHECK: Symbol table '.dynsym'
 // PART0: 1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f1@v3
 // PART0: 2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f2@v2
 // PART0: 3: {{0*}}[[TEXT_ADDR]]  0 NOTYPE  GLOBAL DEFAULT {{.*}} p0@@x1
 // PART1: 1: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND f2@v2
-// PART1: 2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND p0@@x1
+// PART1: 2: 0000000000000000     0 NOTYPE  GLOBAL DEFAULT  UND p0@x1
 // PART1: 3: {{0*}}[[TEXT_ADDR]]  0 NOTYPE  GLOBAL DEFAULT {{.*}} p1@@x2
 // PART1: 4: {{0*}}[[TEXT_ADDR]]  0 NOTYPE  GLOBAL DEFAULT {{.*}} p1alias@@x2
 // CHECK-EMPTY:
 
 // PART0: Symbol table '.symtab'
 // PART0: 000000000000048c     0 NOTYPE  LOCAL  HIDDEN    {{.*}} __part_index_begin
 // PART0: 0000000000000498     0 NOTYPE  LOCAL  HIDDEN    {{.*}} __part_index_end
 

llvm/include/llvm/Object/ELF.h

public:
   template <typename T>
   Expected<const T *> getEntry(const Elf_Shdr &Section, uint32_t Entry) const;
 
   Expected<std::vector<VerDef>>
   getVersionDefinitions(const Elf_Shdr &Sec) const;
   Expected<std::vector<VerNeed>> getVersionDependencies(
       const Elf_Shdr &Sec,
       WarningHandler WarnHandler = &defaultWarningHandler) const;
-  Expected<StringRef> getSymbolVersionByIndex(
-      uint32_t SymbolVersionIndex, bool &IsDefault,
-      SmallVector<Optional<VersionEntry>, 0> &VersionMap) const;
+  Expected<StringRef>
+  getSymbolVersionByIndex(uint32_t SymbolVersionIndex, bool &IsDefault,
+                          SmallVector<Optional<VersionEntry>, 0> &VersionMap,
+                          Optional<bool> IsSymHidden) const;
 
   Expected<StringRef>
   getStringTable(const Elf_Shdr &Section,
                  WarningHandler WarnHandler = &defaultWarningHandler) const;
   Expected<StringRef> getStringTableForSymtab(const Elf_Shdr &Section) const;
   Expected<StringRef> getStringTableForSymtab(const Elf_Shdr &Section,
                                               Elf_Shdr_Range Sections) const;
   Expected<StringRef> getLinkAsStrtab(const typename ELFT::Shdr &Sec) const;
return createError(
         ": it goes past the end of the section (0x" +
         Twine::utohexstr(Section.sh_size) + ")");
   return &Arr[Entry];
 }
 
 template <typename ELFT>
 Expected<StringRef> ELFFile<ELFT>::getSymbolVersionByIndex(
     uint32_t SymbolVersionIndex, bool &IsDefault,
-    SmallVector<Optional<VersionEntry>, 0> &VersionMap) const {
+    SmallVector<Optional<VersionEntry>, 0> &VersionMap,
+    Optional<bool> IsSymHidden) const {
   size_t VersionIndex = SymbolVersionIndex & llvm::ELF::VERSYM_VERSION;
 
   // Special markers for unversioned symbols.
   if (VersionIndex == llvm::ELF::VER_NDX_LOCAL ||
       VersionIndex == llvm::ELF::VER_NDX_GLOBAL) {
     IsDefault = false;
     return "";
   }
 
   // Lookup this symbol in the version table.
   if (VersionIndex >= VersionMap.size() || !VersionMap[VersionIndex])
     return createError("SHT_GNU_versym section refers to a version index " +
                        Twine(VersionIndex) + " which is missing");
 
   const VersionEntry &Entry = *VersionMap[VersionIndex];
-  if (Entry.IsVerDef)
-    IsDefault = !(SymbolVersionIndex & llvm::ELF::VERSYM_HIDDEN);
-  else
+  // A default version (@@) is only available for defined symbols.
+  if (!Entry.IsVerDef || IsSymHidden.getValueOr(false))
     IsDefault = false;
+  else
+    IsDefault = !(SymbolVersionIndex & llvm::ELF::VERSYM_HIDDEN);
   return Entry.Name.c_str();
 }
 
 template <class ELFT>
 Expected<std::vector<VerDef>>
 ELFFile<ELFT>::getVersionDefinitions(const Elf_Shdr &Sec) const {
   Expected<StringRef> StrTabOrErr = getLinkAsStrtab(Sec);
   if (!StrTabOrErr)

llvm/test/tools/llvm-readobj/ELF/dyn-symbols.test

 ProgramHeaders:
   - Type:     PT_LOAD
     VAddr:    0x0000
     FirstSec: .mydynsym
     LastSec:  .mydynsym
 
 ## Case 7: Check how we dump versioned symbols. Use both -V and --dyn-symbols
 ## to check that printed version is consistent.
+## A default version is one that is contained in the version table (SHT_GNU_versym)
+## and only available for defined symbols. We use the "@@" prefix to print it.
+
+## Check how we dump undefined symbols.
+
 # RUN: yaml2obj %s --docnum=6 -o %t6
-# RUN: llvm-readobj -V --dyn-symbols %t6 | FileCheck %s --check-prefix=VERSIONED-LLVM
-# RUN: llvm-readelf -V --dyn-symbols %t6 | FileCheck %s --check-prefix=VERSIONED-GNU
+# RUN: llvm-readobj -V --dyn-symbols %t6 | FileCheck %s --check-prefix=VERSIONED-UND-LLVM
+# RUN: llvm-readelf -V --dyn-symbols %t6 | FileCheck %s --check-prefix=VERSIONED-UND-GNU
 
-# VERSIONED-LLVM:      Symbol {
-# VERSIONED-LLVM:        Name: foo (16)
-# VERSIONED-LLVM-NEXT:   Value: 0x0
-# VERSIONED-LLVM-NEXT:   Size: 0
-# VERSIONED-LLVM-NEXT:   Binding: Local (0x0)
-# VERSIONED-LLVM-NEXT:   Type: None (0x0)
-# VERSIONED-LLVM-NEXT:   Other: 0
-# VERSIONED-LLVM-NEXT:   Section: Undefined (0x0)
-# VERSIONED-LLVM-NEXT: }
-# VERSIONED-LLVM-NEXT: Symbol {
-# VERSIONED-LLVM-NEXT:   Name: bar@@Default (12)
-# VERSIONED-LLVM-NEXT:   Value: 0x0
-# VERSIONED-LLVM-NEXT:   Size: 0
-# VERSIONED-LLVM-NEXT:   Binding: Local (0x0)
-# VERSIONED-LLVM-NEXT:   Type: None (0x0)
-# VERSIONED-LLVM-NEXT:   Other: 0
-# VERSIONED-LLVM-NEXT:   Section: Undefined (0x0)
-# VERSIONED-LLVM-NEXT: }
-# VERSIONED-LLVM-NEXT: Symbol {
-# VERSIONED-LLVM-NEXT:   Name: zed@NonDefault (20)
-# VERSIONED-LLVM-NEXT:   Value: 0x0
-# VERSIONED-LLVM-NEXT:   Size: 0
-# VERSIONED-LLVM-NEXT:   Binding: Local (0x0)
-# VERSIONED-LLVM-NEXT:   Type: None (0x0)
-# VERSIONED-LLVM-NEXT:   Other: 0
-# VERSIONED-LLVM-NEXT:   Section: Undefined (0x0)
-# VERSIONED-LLVM-NEXT: }
-# VERSIONED-LLVM: VersionSymbols [
-# VERSIONED-LLVM:  Name: foo
-# VERSIONED-LLVM:  Name: bar@@Default
-# VERSIONED-LLVM:  Name: zed@NonDefault
-
-# VERSIONED-GNU:      Num:    Value          Size Type    Bind   Vis       Ndx Name
-# VERSIONED-GNU:        1: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT   UND foo
-# VERSIONED-GNU-NEXT:   2: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT   UND bar@@Default
-# VERSIONED-GNU-NEXT:   3: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT   UND zed@NonDefault
-# VERSIONED-GNU:      000:   0 (*local*) 1 (*global*) 2 (Default) 3h(NonDefault)
+# VERSIONED-UND-LLVM:       DynamicSymbols [
+# VERSIONED-UND-LLVM-NEXT:   Symbol {
+# VERSIONED-UND-LLVM-NEXT:     Name:  (0)
+# VERSIONED-UND-LLVM-NEXT:     Value: 0x0
+# VERSIONED-UND-LLVM-NEXT:     Size: 0
+# VERSIONED-UND-LLVM-NEXT:     Binding: Local (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Type: None (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Other: 0
+# VERSIONED-UND-LLVM-NEXT:     Section: Undefined (0x0)
+# VERSIONED-UND-LLVM-NEXT:   }
+# VERSIONED-UND-LLVM-NEXT:   Symbol {
+# VERSIONED-UND-LLVM-NEXT:     Name: localversym (28)
+# VERSIONED-UND-LLVM-NEXT:     Value: 0x0
+# VERSIONED-UND-LLVM-NEXT:     Size: 0
+# VERSIONED-UND-LLVM-NEXT:     Binding: Local (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Type: None (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Other: 0
+# VERSIONED-UND-LLVM-NEXT:     Section: Undefined (0x0)
+# VERSIONED-UND-LLVM-NEXT:   }
+# VERSIONED-UND-LLVM-NEXT:   Symbol {
+# VERSIONED-UND-LLVM-NEXT:     Name: globalversym (40)
+# VERSIONED-UND-LLVM-NEXT:     Value: 0x0
+# VERSIONED-UND-LLVM-NEXT:     Size: 0
+# VERSIONED-UND-LLVM-NEXT:     Binding: Local (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Type: None (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Other: 0
+# VERSIONED-UND-LLVM-NEXT:     Section: Undefined (0x0)
+# VERSIONED-UND-LLVM-NEXT:   }
+# VERSIONED-UND-LLVM-NEXT:   Symbol {
+# VERSIONED-UND-LLVM-NEXT:     Name: aaa@v2 (65)
+# VERSIONED-UND-LLVM-NEXT:     Value: 0x0
+# VERSIONED-UND-LLVM-NEXT:     Size: 0
+# VERSIONED-UND-LLVM-NEXT:     Binding: Local (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Type: None (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Other: 0
+# VERSIONED-UND-LLVM-NEXT:     Section: Undefined (0x0)
+# VERSIONED-UND-LLVM-NEXT:   }
+# VERSIONED-UND-LLVM-NEXT:   Symbol {
+# VERSIONED-UND-LLVM-NEXT:     Name: bbb@v3hidden (61)
+# VERSIONED-UND-LLVM-NEXT:     Value: 0x0
+# VERSIONED-UND-LLVM-NEXT:     Size: 0
+# VERSIONED-UND-LLVM-NEXT:     Binding: Local (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Type: None (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Other: 0
+# VERSIONED-UND-LLVM-NEXT:     Section: Undefined (0x0)
+# VERSIONED-UND-LLVM-NEXT:   }
+# VERSIONED-UND-LLVM-NEXT:   Symbol {
+# VERSIONED-UND-LLVM-NEXT:     Name: ccc@v4 (57)
+# VERSIONED-UND-LLVM-NEXT:     Value: 0x0
+# VERSIONED-UND-LLVM-NEXT:     Size: 0
+# VERSIONED-UND-LLVM-NEXT:     Binding: Local (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Type: None (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Other: 0
+# VERSIONED-UND-LLVM-NEXT:     Section: Undefined (0x0)
+# VERSIONED-UND-LLVM-NEXT:   }
+# VERSIONED-UND-LLVM-NEXT:   Symbol {
+# VERSIONED-UND-LLVM-NEXT:     Name: ddd@v5hidden (53)
+# VERSIONED-UND-LLVM-NEXT:     Value: 0x0
+# VERSIONED-UND-LLVM-NEXT:     Size: 0
+# VERSIONED-UND-LLVM-NEXT:     Binding: Local (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Type: None (0x0)
+# VERSIONED-UND-LLVM-NEXT:     Other: 0
+# VERSIONED-UND-LLVM-NEXT:     Section: Undefined (0x0)
+# VERSIONED-UND-LLVM-NEXT:   }
+# VERSIONED-UND-LLVM-NEXT: ]
+# VERSIONED-UND-LLVM:      VersionSymbols [
+# VERSIONED-UND-LLVM:          Name: localversym
+# VERSIONED-UND-LLVM:          Name: globalversym
+# VERSIONED-UND-LLVM:          Name: aaa@v2
+# VERSIONED-UND-LLVM:          Name: bbb@v3hidden
+# VERSIONED-UND-LLVM:          Name: ccc@v4
+# VERSIONED-UND-LLVM:          Name: ddd@v5hidden
+
+# VERSIONED-UND-GNU:      Num:    Value          Size Type    Bind   Vis     Ndx Name
+# VERSIONED-UND-GNU:        1: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT UND localversym
+# VERSIONED-UND-GNU-NEXT:   2: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT UND globalversym
+# VERSIONED-UND-GNU-NEXT:   3: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT UND aaa@v2
+# VERSIONED-UND-GNU-NEXT:   4: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT UND bbb@v3hidden
+# VERSIONED-UND-GNU-NEXT:   5: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT UND ccc@v4
+# VERSIONED-UND-GNU-NEXT:   6: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT UND ddd@v5hidden
+# VERSIONED-UND-GNU:      000:   0 (*local*)  0 (*local*) 1 (*global*) 2 (v2)
+# VERSIONED-UND-GNU:      004:   3h(v3hidden) 4 (v4)      5h(v5hidden)
 
 --- !ELF
 FileHeader:
   Class: ELFCLASS64
   Data:  ELFDATA2LSB
   Type:  ET_DYN
 Sections:
   - Name:         .gnu.version
     Type:         SHT_GNU_versym
     Flags:        [ SHF_ALLOC ]
     Link:         .dynsym
     AddressAlign: 0x2
     EntSize:      0x2
 ## 0x8000 is a special VERSYM_HIDDEN bit.
-    Entries:      [ 0, 1, 2, 0x8003 ]
+## Here we have: VER_NDX_LOCAL (0), VER_NDX_GLOBAL (1), two versions
+## from the SHT_GNU_verdef section (2, 0x8003) and two versions
+## from the SHT_GNU_verneed section (4, 0x8005).
+    Entries:      [ 0, 0, 1, 2, 0x8003, 4, 0x8005 ]
   - Name:         .gnu.version_d
     Type:         SHT_GNU_verdef
     Flags:        [ SHF_ALLOC ]
     AddressAlign: 0x4
     Entries:
       - VersionNdx: 2
         Names:
-          - Default
+          - v2
       - VersionNdx: 3
         Names:
-          - NonDefault
+          - v3hidden
+  - Name:  .gnu.version_r
+    Type:  SHT_GNU_verneed
+    Flags: [ SHF_ALLOC ]
+    Dependencies:
+      - Version: 1
+        File:    file1.so
+        Entries:
+          - Name:  v4
+            Other: 4
+            Hash:  0
+            Flags: 0
+      - Version: 1
+        File:    file2.0
+        Entries:
+          - Name:  v5hidden
+            Other: 5
+            Hash:  0
+            Flags: 0
 DynamicSymbols:
-  - Name: foo
-  - Name:  [[NAME=bar]]
-    Type:  [[TYPE=STT_NOTYPE]]
+  - Name:  localversym
     Index: [[INDEX=<none>]]
-  - Name: [[NAME=zed]]
-    Type: [[TYPE=STT_NOTYPE]]
+  - Name:  globalversym
+    Index: [[INDEX=<none>]]
+  - Name:  aaa
+    Index: [[INDEX=<none>]]
+  - Name:  [[NAME=bbb]]
+    Type:  [[TYPE=STT_NOTYPE]]
+    Index: [[INDEX_BBB=<none>]]
+  - Name:  [[NAME=ccc]]
+    Type:  [[TYPE=STT_NOTYPE]]
+    Index: [[INDEX=<none>]]
+  - Name:  ddd
+    Index: [[INDEX=<none>]]
+
+## In this case all dynamic symbols are defined. Check that we print the
+## "@@" prefix for default versions as expected.
+
+# RUN: yaml2obj %s --docnum=6 -DINDEX=1 -DINDEX_BBB=1 -o %t6.def
+# RUN: llvm-readobj -V --dyn-symbols %t6.def | FileCheck %s --check-prefix=VERSIONED-DEF-LLVM
+# RUN: llvm-readelf -V --dyn-symbols %t6.def | FileCheck %s --check-prefix=VERSIONED-DEF-GNU
+
+# VERSIONED-DEF-LLVM:      DynamicSymbols [
+# VERSIONED-DEF-LLVM:        Symbol {
+# VERSIONED-DEF-LLVM:          Name:    localversym (28)
+# VERSIONED-DEF-LLVM:          Section: .gnu.version (0x1)
+# VERSIONED-DEF-LLVM-NEXT:   }
+# VERSIONED-DEF-LLVM-NEXT:   Symbol {
+# VERSIONED-DEF-LLVM-NEXT:     Name:    globalversym (40)
+# VERSIONED-DEF-LLVM:          Section: .gnu.version (0x1)
+# VERSIONED-DEF-LLVM-NEXT:   }
+# VERSIONED-DEF-LLVM-NEXT:   Symbol {
+# VERSIONED-DEF-LLVM-NEXT:     Name:    aaa@@v2 (65)
+# VERSIONED-DEF-LLVM:          Section: .gnu.version (0x1)
+# VERSIONED-DEF-LLVM-NEXT:   }
+# VERSIONED-DEF-LLVM-NEXT:   Symbol {
+# VERSIONED-DEF-LLVM-NEXT:     Name:    bbb@v3hidden (61)
+# VERSIONED-DEF-LLVM:          Section: .gnu.version (0x1)
+# VERSIONED-DEF-LLVM-NEXT:   }
+# VERSIONED-DEF-LLVM-NEXT:   Symbol {
+# VERSIONED-DEF-LLVM-NEXT:     Name:    ccc@v4 (57)
+# VERSIONED-DEF-LLVM:          Section: .gnu.version (0x1)
+# VERSIONED-DEF-LLVM-NEXT:   }
+# VERSIONED-DEF-LLVM-NEXT:   Symbol {
+# VERSIONED-DEF-LLVM-NEXT:     Name:    ddd@v5hidden (53)
+# VERSIONED-DEF-LLVM:          Section: .gnu.version (0x1)
+# VERSIONED-DEF-LLVM-NEXT:   }
+# VERSIONED-DEF-LLVM:      VersionSymbols [
+# VERSIONED-DEF-LLVM:          Name: localversym
+# VERSIONED-DEF-LLVM:          Name: globalversym
+# VERSIONED-DEF-LLVM:          Name: aaa@@v2
+# VERSIONED-DEF-LLVM:          Name: bbb@v3hidden
+# VERSIONED-DEF-LLVM:          Name: ccc@v4
+# VERSIONED-DEF-LLVM:          Name: ddd@v5hidden
+
+# VERSIONED-DEF-GNU:      Num: {{.*}} Vis     Ndx Name
+# VERSIONED-DEF-GNU:        1: {{.*}} DEFAULT   1 localversym
+# VERSIONED-DEF-GNU-NEXT:   2: {{.*}} DEFAULT   1 globalversym
+# VERSIONED-DEF-GNU-NEXT:   3: {{.*}} DEFAULT   1 aaa@@v2
+# VERSIONED-DEF-GNU-NEXT:   4: {{.*}} DEFAULT   1 bbb@v3hidden
+# VERSIONED-DEF-GNU-NEXT:   5: {{.*}} DEFAULT   1 ccc@v4
+# VERSIONED-DEF-GNU-NEXT:   6: {{.*}} DEFAULT   1 ddd@v5hidden
 
 ## Check the behavior for unnamed versioned section symbols.
-# RUN: yaml2obj %s -DTYPE=STT_SECTION -DNAME="''" -DINDEX=SHN_ABS --docnum=6 -o %t6.sec.sym
+# RUN: yaml2obj %s -DTYPE=STT_SECTION -DNAME="''" -DINDEX_BBB=SHN_ABS --docnum=6 -o %t6.sec.sym
 # RUN: llvm-readobj -V --dyn-symbols %t6.sec.sym 2>&1 | \
 # RUN:   FileCheck %s -DFILE=%t6.sec.sym --check-prefix=VERSIONED-SEC-SYM-LLVM
 # RUN: llvm-readelf -V --dyn-symbols %t6.sec.sym 2>&1 | \
 # RUN:   FileCheck %s -DFILE=%t6.sec.sym --check-prefix=VERSIONED-SEC-SYM-GNU
 
 # VERSIONED-SEC-SYM-LLVM: DynamicSymbols [
-# VERSIONED-SEC-SYM-LLVM:  Name: foo (12)
+# VERSIONED-SEC-SYM-LLVM:  Name: localversym (28)
+# VERSIONED-SEC-SYM-LLVM:  Name: globalversym (40)
+# VERSIONED-SEC-SYM-LLVM:  Name: aaa@v2 (57)
 # VERSIONED-SEC-SYM-LLVM: warning: '[[FILE]]': unable to get section index for symbol with st_shndx = 0xfff1 (SHN_ABS)
 # VERSIONED-SEC-SYM-LLVM:  Name: <?> (0)
 # VERSIONED-SEC-SYM-LLVM: warning: '[[FILE]]': unable to get section index for symbol with st_shndx = 0x0 (SHN_UNDEF)
 # VERSIONED-SEC-SYM-LLVM:  Name: <?> (0)
+# VERSIONED-SEC-SYM-LLVM:  Name: ddd@v5hidden (53)
 # VERSIONED-SEC-SYM-LLVM: VersionSymbols [
-# VERSIONED-SEC-SYM-LLVM:  Name: foo
+# VERSIONED-SEC-SYM-LLVM:  Name: localversym
+# VERSIONED-SEC-SYM-LLVM:  Name: globalversym
+# VERSIONED-SEC-SYM-LLVM:  Name: aaa@v2
 # VERSIONED-SEC-SYM-LLVM:  Name: <?>
 # VERSIONED-SEC-SYM-LLVM:  Name: <?>
+# VERSIONED-SEC-SYM-LLVM:  Name: ddd@v5hidden
 
-# VERSIONED-SEC-SYM-GNU:     Symbol table '.dynsym' contains 4 entries:
+# VERSIONED-SEC-SYM-GNU:     Symbol table '.dynsym' contains 7 entries:
 # VERSIONED-SEC-SYM-GNU:        Num: {{.*}} Ndx Name
-# VERSIONED-SEC-SYM-GNU:          1: {{.*}} UND foo
-# VERSIONED-SEC-SYM-GNU:      warning: '[[FILE]]': unable to get section index for symbol with st_shndx = 0xfff1 (SHN_ABS)
-# VERSIONED-SEC-SYM-GNU-NEXT:     2: {{.*}} ABS <?>
+# VERSIONED-SEC-SYM-GNU:          1: {{.*}} UND localversym
+# VERSIONED-SEC-SYM-GNU-NEXT:     2: {{.*}} UND globalversym
+# VERSIONED-SEC-SYM-GNU-NEXT:     3: {{.*}} UND aaa@v2
+# VERSIONED-SEC-SYM-GNU-NEXT: warning: '[[FILE]]': unable to get section index for symbol with st_shndx = 0xfff1 (SHN_ABS)
+# VERSIONED-SEC-SYM-GNU-NEXT:     4: {{.*}} ABS <?>
 # VERSIONED-SEC-SYM-GNU-NEXT: warning: '[[FILE]]': unable to get section index for symbol with st_shndx = 0x0 (SHN_UNDEF)
-# VERSIONED-SEC-SYM-GNU-NEXT:     3: {{.*}} UND <?>
+# VERSIONED-SEC-SYM-GNU-NEXT:     5: {{.*}} UND <?>
+# VERSIONED-SEC-SYM-GNU-NEXT:     6: {{.*}} UND ddd@v5hidden
 
 ## Check we print a proper warning when an unnamed versioned section symbol has st_shndx = SHN_XINDEX, but there
 ## is no SHT_SYMTAB_SHNDX section in the object.
-# RUN: yaml2obj %s -DTYPE=STT_SECTION -DNAME="''" -DINDEX=SHN_XINDEX --docnum=6 -o %t6.sec.xindex.sym
+# RUN: yaml2obj %s -DTYPE=STT_SECTION -DNAME="''" -DINDEX_BBB=SHN_XINDEX --docnum=6 -o %t6.sec.xindex.sym
 # RUN: llvm-readobj -V --dyn-symbols %t6.sec.xindex.sym 2>&1 | \
 # RUN:   FileCheck %s -DFILE=%t6.sec.xindex.sym --check-prefix=VERSIONED-SEC-SYM-XINDEX-LLVM
 # RUN: llvm-readelf -V --dyn-symbols %t6.sec.xindex.sym 2>&1 | \
 # RUN:   FileCheck %s -DFILE=%t6.sec.xindex.sym --check-prefix=VERSIONED-SEC-SYM-XINDEX-GNU
 
-# VERSIONED-SEC-SYM-XINDEX-LLVM:       Name: (0)
-# VERSIONED-SEC-SYM-XINDEX-LLVM:       Name: foo (12)
-# VERSIONED-SEC-SYM-XINDEX-LLVM:      warning: '[[FILE]]': found an extended symbol index (2), but unable to locate the extended symbol index table
+# VERSIONED-SEC-SYM-XINDEX-LLVM:       Name: aaa@v2 (57)
+# VERSIONED-SEC-SYM-XINDEX-LLVM:      warning: '[[FILE]]': found an extended symbol index (4), but unable to locate the extended symbol index table
 # VERSIONED-SEC-SYM-XINDEX-LLVM-NEXT: Symbol {
 # VERSIONED-SEC-SYM-XINDEX-LLVM-NEXT:  Name: <?> (0)
-# VERSIONED-SEC-SYM-XINDEX-LLVM:       Name: <?> (0)
 
-# VERSIONED-SEC-SYM-XINDEX-GNU:      Symbol table '.dynsym' contains 4 entries:
-# VERSIONED-SEC-SYM-XINDEX-GNU:         Num: {{.*}} Ndx Name
-# VERSIONED-SEC-SYM-XINDEX-GNU:      warning: '[[FILE]]': found an extended symbol index (2), but unable to locate the extended symbol index table
-# VERSIONED-SEC-SYM-XINDEX-GNU-NEXT:      2: {{.*}} RSV[0xffff] <?>
+# VERSIONED-SEC-SYM-XINDEX-GNU:      3: {{.*}} UND aaa@v2
+# VERSIONED-SEC-SYM-XINDEX-GNU-NEXT: warning: '[[FILE]]': found an extended symbol index (4), but unable to locate the extended symbol index table
+# VERSIONED-SEC-SYM-XINDEX-GNU-NEXT: 4: {{.*}} RSV[0xffff] <?>
 
 ## Case 8: Check what we print when:
 ## a) The dynamic symbol table does not exist.
 # RUN: yaml2obj %s --docnum=7 -o %t7
 # RUN: llvm-readobj --dyn-symbols %t7 | FileCheck %s --check-prefix=NO-DYNSYM-LLVM
 # RUN: llvm-readelf --dyn-symbols %t7 | count 0
 ## b) The dynamic symbol table has a size of 0.
 # RUN: yaml2obj %s --docnum=8 -o %t8

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

 
 # 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:     Name: sym1@VERSION1
 # LLVM-NEXT:   }
 # LLVM-NEXT:   Symbol {
 # LLVM-NEXT:     Version: 3
-# LLVM-NEXT:     Name: sym2@@VERSION2
+# 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/tools/llvm-nm/llvm-nm.cpp

Expected<const typename ELFT::Versym *> VerEntryOrErr =
         Obj.template getEntry<typename ELFT::Versym>(*SymVerSec, I);
     if (!VerEntryOrErr)
       return createError("unable to read an entry with index " + Twine(I) +
                          " from " + describe(Obj, *SymVerSec) + ": " +
                          toString(VerEntryOrErr.takeError()));
 
     bool IsDefault;
     Expected<StringRef> VerOrErr = Obj.getSymbolVersionByIndex(
-        (*VerEntryOrErr)->vs_index, IsDefault, *MapOrErr);
+        (*VerEntryOrErr)->vs_index, IsDefault, *MapOrErr, /*IsSymHidden=*/None);
     if (!VerOrErr)
       return createError("unable to get a version for entry " + Twine(I) +
                          " of " + describe(Obj, *SymVerSec) + ": " +
                          toString(VerOrErr.takeError()));
 
     Ret.push_back((*VerOrErr).str());
   }
 

llvm/tools/llvm-readobj/ELFDumper.cpp

if (Version == VER_NDX_LOCAL || Version == VER_NDX_GLOBAL) {
     IsDefault = false;
     return "";
   }
 
   Expected<SmallVector<Optional<VersionEntry>, 0> *> MapOrErr =
       getVersionMap();
   if (!MapOrErr)
     return MapOrErr.takeError();
-  return Obj.getSymbolVersionByIndex(Version, IsDefault, **MapOrErr);
+
+  return Obj.getSymbolVersionByIndex(Version, IsDefault, **MapOrErr,
+                                     Sym.st_shndx == ELF::SHN_UNDEF);
 }
 
 template <typename ELFT>
 Expected<RelSymbol<ELFT>>
 ELFDumper<ELFT>::getRelocationTarget(const Relocation<ELFT> &R,
                                      const Elf_Shdr *SymTab) const {
   if (R.Symbol == 0)
     return RelSymbol<ELFT>(nullptr, "");
 
for (size_t I = 0, E = VerTable.size(); I < E; ++I) {
     }
 
     if (!VersionMap) {
       Versions.emplace_back("<corrupt>");
       continue;
     }
 
     bool IsDefault;
-    Expected<StringRef> NameOrErr =
-        this->Obj.getSymbolVersionByIndex(Ndx, IsDefault, *VersionMap);
+    Expected<StringRef> NameOrErr = this->Obj.getSymbolVersionByIndex(
+        Ndx, IsDefault, *VersionMap, /*IsSymHidden=*/None);
     if (!NameOrErr) {
       this->reportUniqueWarning("unable to get a version for entry " +
                                 Twine(I) + " of " + this->describe(*Sec) +
                                 ": " + toString(NameOrErr.takeError()));
       Versions.emplace_back("<corrupt>");
       continue;
     }
     Versions.emplace_back(*NameOrErr);