[llvm-nm] Fix Bug 41353 - unique symbols printed as D instead of u
Summary:
https://bugs.llvm.org/show_bug.cgi?id=41353
I'm new to LLVM and C++ so please do not hesitate to iterate with me on this fix.
Patch by Mike Pozulp!
Reviewers: rupprecht, zbrid, grimar, jhenderson
Reviewed By: rupprecht, jhenderson
Subscribers: jhenderson, chrisjackson, MaskRay, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D61117
llvm-svn: 361595
diff --git a/llvm/include/llvm/Object/ELFObjectFile.h b/llvm/include/llvm/Object/ELFObjectFile.h
index ed54ad0..d5e9d36 100644
--- a/llvm/include/llvm/Object/ELFObjectFile.h
+++ b/llvm/include/llvm/Object/ELFObjectFile.h
@@ -56,6 +56,7 @@
virtual uint16_t getEMachine() const = 0;
virtual uint64_t getSymbolSize(DataRefImpl Symb) const = 0;
+ virtual uint8_t getSymbolBinding(DataRefImpl Symb) const = 0;
virtual uint8_t getSymbolOther(DataRefImpl Symb) const = 0;
virtual uint8_t getSymbolELFType(DataRefImpl Symb) const = 0;
@@ -145,6 +146,10 @@
return getObject()->getSymbolSize(getRawDataRefImpl());
}
+ uint8_t getBinding() const {
+ return getObject()->getSymbolBinding(getRawDataRefImpl());
+ }
+
uint8_t getOther() const {
return getObject()->getSymbolOther(getRawDataRefImpl());
}
@@ -252,6 +257,7 @@
uint32_t getSymbolAlignment(DataRefImpl Symb) const override;
uint64_t getCommonSymbolSizeImpl(DataRefImpl Symb) const override;
uint32_t getSymbolFlags(DataRefImpl Symb) const override;
+ uint8_t getSymbolBinding(DataRefImpl Symb) const override;
uint8_t getSymbolOther(DataRefImpl Symb) const override;
uint8_t getSymbolELFType(DataRefImpl Symb) const override;
Expected<SymbolRef::Type> getSymbolType(DataRefImpl Symb) const override;
@@ -554,6 +560,11 @@
}
template <class ELFT>
+uint8_t ELFObjectFile<ELFT>::getSymbolBinding(DataRefImpl Symb) const {
+ return getSymbol(Symb)->getBinding();
+}
+
+template <class ELFT>
uint8_t ELFObjectFile<ELFT>::getSymbolOther(DataRefImpl Symb) const {
return getSymbol(Symb)->st_other;
}
diff --git a/llvm/test/tools/llvm-nm/X86/unique.test b/llvm/test/tools/llvm-nm/X86/unique.test
new file mode 100644
index 0000000..a8879d7
--- /dev/null
+++ b/llvm/test/tools/llvm-nm/X86/unique.test
@@ -0,0 +1,50 @@
+## Check that we print 'u' for unique symbols
+## and 'U' for a unique symbol without a section.
+# RUN: yaml2obj %s | llvm-nm - | FileCheck %s
+
+--- !ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_X86_64
+Sections:
+ - Name: .nobits
+ Type: SHT_NOBITS
+ - Name: .progbits
+ Type: SHT_PROGBITS
+ - Name: .progbits_alloc
+ Type: SHT_PROGBITS
+ Flags: [SHF_ALLOC]
+ - Name: .progbits_alloc_write
+ Type: SHT_PROGBITS
+ Flags: [SHF_ALLOC, SHF_WRITE]
+ - Name: .progbits_execinstr
+ Type: SHT_PROGBITS
+ Flags: [SHF_EXECINSTR]
+Symbols:
+ - Name: nosection
+ Binding: STB_GNU_UNIQUE
+ - Name: nobits
+ Section: .nobits
+ Binding: STB_GNU_UNIQUE
+ - Name: progbits
+ Section: .progbits
+ Binding: STB_GNU_UNIQUE
+ - Name: progbits_alloc
+ Section: .progbits_alloc
+ Binding: STB_GNU_UNIQUE
+ - Name: progbits_alloc_write
+ Section: .progbits_alloc_write
+ Binding: STB_GNU_UNIQUE
+ - Name: progbits_execinstr
+ Section: .progbits_execinstr
+ Binding: STB_GNU_UNIQUE
+...
+
+# CHECK: 0000000000000000 u nobits
+# CHECK: U nosection
+# CHECK: 0000000000000000 u progbits
+# CHECK: 0000000000000000 u progbits_alloc
+# CHECK: 0000000000000000 u progbits_alloc_write
+# CHECK: 0000000000000000 u progbits_execinstr
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp
index f21978d..871ca63 100644
--- a/llvm/tools/llvm-nm/llvm-nm.cpp
+++ b/llvm/tools/llvm-nm/llvm-nm.cpp
@@ -894,6 +894,9 @@
return '?';
}
+ if (SymI->getBinding() == ELF::STB_GNU_UNIQUE)
+ return 'u';
+
elf_section_iterator SecI = *SecIOrErr;
if (SecI != Obj.section_end()) {
uint32_t Type = SecI->getType();
@@ -1119,10 +1122,13 @@
else
Ret = getSymbolNMTypeChar(cast<ELFObjectFileBase>(Obj), I);
- if (Symflags & object::SymbolRef::SF_Global)
- Ret = toupper(Ret);
+ if (!(Symflags & object::SymbolRef::SF_Global))
+ return Ret;
- return Ret;
+ if (Obj.isELF() && ELFSymbolRef(*I).getBinding() == ELF::STB_GNU_UNIQUE)
+ return Ret;
+
+ return toupper(Ret);
}
// getNsectForSegSect() is used to implement the Mach-O "-s segname sectname"
