Revert "Improve "llvm-nm -f sysv" output for Elf files"

This reverts commit r354833, it was causing ASan test failures on
sanitizer-x86_64-linux-fast.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@354849 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Object/ELFObjectFile.h b/include/llvm/Object/ELFObjectFile.h
index 9d0f58da11a3b557441160ce0a3d2196924b4eaf..aab7340a9e89c60c9981f493323d992c57886522 100644 (file)
--- a/include/llvm/Object/ELFObjectFile.h
+++ b/include/llvm/Object/ELFObjectFile.h
@@ -41,8 +41,6 @@
 namespace llvm {
 namespace object {
 
-extern const llvm::EnumEntry<unsigned> ElfSymbolTypes[8];
-
 class elf_symbol_iterator;
 
 class ELFObjectFileBase : public ObjectFile {
@@ -150,17 +148,6 @@ public:
   uint8_t getELFType() const {
     return getObject()->getSymbolELFType(getRawDataRefImpl());
   }
-
-  void getELFTypeName(StringRef &TN) const {
-    uint8_t et = getELFType();
-    TN = "";
-    for (auto &ee : ElfSymbolTypes) {
-      if (ee.Value == et) {
-        TN = ee.AltName;
-        break;
-      }
-    }
-  }
 };
 
 class elf_symbol_iterator : public symbol_iterator {
@@ -257,7 +244,6 @@ protected:
   Expected<section_iterator> getSymbolSection(const Elf_Sym *Symb,
                                               const Elf_Shdr *SymTab) const;
   Expected<section_iterator> getSymbolSection(DataRefImpl Symb) const override;
-  int getSymbolSectionIndex(DataRefImpl Symb) const override;
 
   void moveSectionNext(DataRefImpl &Sec) const override;
   std::error_code getSectionName(DataRefImpl Sec,
@@ -669,13 +655,6 @@ ELFObjectFile<ELFT>::getSymbolSection(DataRefImpl Symb) const {
   return getSymbolSection(Sym, SymTab);
 }
 
-template <class ELFT>
-int
-ELFObjectFile<ELFT>::getSymbolSectionIndex(DataRefImpl Symb) const {
-  const Elf_Sym *Sym = getSymbol(Symb);
-  return Sym->st_shndx;
-}
-
 template <class ELFT>
 void ELFObjectFile<ELFT>::moveSectionNext(DataRefImpl &Sec) const {
   const Elf_Shdr *ESec = getSection(Sec);

diff --git a/include/llvm/Object/ObjectFile.h b/include/llvm/Object/ObjectFile.h
index 31fbeb6c88e140372d22e6d413faba90aea5939c..f13775c914df808ecdfd4454158e1f3011f8bba4 100644 (file)
--- a/include/llvm/Object/ObjectFile.h
+++ b/include/llvm/Object/ObjectFile.h
@@ -174,9 +174,6 @@ public:
   /// end_sections() if it is undefined or is an absolute symbol.
   Expected<section_iterator> getSection() const;
 
-  // Get the section index of the section of this symbol
-  int getSectionIndex() const;
-
   const ObjectFile *getObject() const;
 };
 
@@ -231,7 +228,6 @@ protected:
   virtual Expected<SymbolRef::Type> getSymbolType(DataRefImpl Symb) const = 0;
   virtual Expected<section_iterator>
   getSymbolSection(DataRefImpl Symb) const = 0;
-  virtual int getSymbolSectionIndex(DataRefImpl Symb) const { return -1; }
 
   // Same as above for SectionRef.
   friend class SectionRef;
@@ -379,10 +375,6 @@ inline uint64_t SymbolRef::getCommonSize() const {
   return getObject()->getCommonSymbolSize(getRawDataRefImpl());
 }
 
-inline int SymbolRef::getSectionIndex() const {
-  return getObject()->getSymbolSectionIndex(getRawDataRefImpl());
-}
-
 inline Expected<section_iterator> SymbolRef::getSection() const {
   return getObject()->getSymbolSection(getRawDataRefImpl());
 }

diff --git a/lib/Object/ELFObjectFile.cpp b/lib/Object/ELFObjectFile.cpp
index 822cee7212b7b2e5c9d57c4ebf214daa71dc60fa..15e09f8116b0896a2f0199ca3925a4aa891015ab 100644 (file)
--- a/lib/Object/ELFObjectFile.cpp
+++ b/lib/Object/ELFObjectFile.cpp
@@ -35,16 +35,6 @@
 using namespace llvm;
 using namespace object;
 
-const EnumEntry<unsigned> llvm::object::ElfSymbolTypes[8] = {
-    {"None", "NOTYPE", ELF::STT_NOTYPE},
-    {"Object", "OBJECT", ELF::STT_OBJECT},
-    {"Function", "FUNC", ELF::STT_FUNC},
-    {"Section", "SECTION", ELF::STT_SECTION},
-    {"File", "FILE", ELF::STT_FILE},
-    {"Common", "COMMON", ELF::STT_COMMON},
-    {"TLS", "TLS", ELF::STT_TLS},
-    {"GNU_IFunc", "IFUNC", ELF::STT_GNU_IFUNC}};
-
 ELFObjectFileBase::ELFObjectFileBase(unsigned int Type, MemoryBufferRef Source)
     : ObjectFile(Type, Source) {}
 

diff --git a/test/tools/llvm-nm/X86/sysv-i386.test b/test/tools/llvm-nm/X86/sysv-i386.test
index d3d43247d36e3cfe4efc32c261174458cce66316..b9b1f6024b1fafea52bdd28e71eb792725a18909 100644 (file)
--- a/test/tools/llvm-nm/X86/sysv-i386.test
+++ b/test/tools/llvm-nm/X86/sysv-i386.test
@@ -1,6 +1,6 @@
 RUN: llvm-nm -f sysv %p/Inputs/hello.obj.elf-i386 | FileCheck %s --strict-whitespace
 
 CHECK: Name                  Value   Class        Type         Size     Line  Section
-CHECK: .L.str              |00000000|   r  |            OBJECT|0000000f|     |.rodata.str1.1
-CHECK: main                |00000000|   T  |              FUNC|00000015|     |.text
-CHECK: puts                |        |   U  |            NOTYPE|        |     |*UND*
+CHECK: .L.str              |00000000|   r  |                  |0000000f|     |
+CHECK: main                |00000000|   T  |                  |00000015|     |
+CHECK: puts                |        |   U  |                  |        |     |

diff --git a/test/tools/llvm-nm/X86/sysv-x86_64.test b/test/tools/llvm-nm/X86/sysv-x86_64.test
index c517af97ad8813441d8bc80d647a579ee8407b0f..bf041b202f772b5d144277cc601bf7ad3fe47307 100644 (file)
--- a/test/tools/llvm-nm/X86/sysv-x86_64.test
+++ b/test/tools/llvm-nm/X86/sysv-x86_64.test
@@ -2,8 +2,8 @@ RUN: llvm-nm -f sysv %p/Inputs/hello.obj.elf-x86_64 | FileCheck %s --check-prefi
 RUN: llvm-nm -f sysv %p/Inputs/hello.obj.macho-x86_64 2>&1 | FileCheck %s --check-prefix=MACHO --strict-whitespace
 
 ELF: Name                  Value           Class        Type         Size             Line  Section
-ELF: main                |0000000000000000|   T  |              FUNC|0000000000000015|     |.text
-ELF: puts                |                |   U  |            NOTYPE|                |     |*UND*
+ELF: main                |0000000000000000|   T  |                  |0000000000000015|     |
+ELF: puts                |                |   U  |                  |                |     |
 
 MACHO: Name                  Value           Class        Type         Size             Line  Section
 MACHO: EH_frame0           |0000000000000068|   s  |                  |0000000000000000|     |

diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp
index 55ef0b7661f6c10f416724724d0cd563f11d8048..a7346d56f32904aa9bfa00b9e7bcfa5e0b2ea9a9 100644 (file)
--- a/tools/llvm-nm/llvm-nm.cpp
+++ b/tools/llvm-nm/llvm-nm.cpp
@@ -262,8 +262,6 @@ struct NMSymbol {
   uint64_t Size;
   char TypeChar;
   StringRef Name;
-  StringRef SectionName;
-  StringRef TypeName;
   BasicSymbolRef Sym;
   // The Sym field above points to the native symbol in the object file,
   // for Mach-O when we are creating symbols from the dyld info the above
@@ -884,13 +882,8 @@ static void sortAndPrintSymbolList(SymbolicFile &Obj, bool printName,
       std::string PaddedName(Name);
       while (PaddedName.length() < 20)
         PaddedName += " ";
-      std::string TNPad = "";
-      int TNL = I->TypeName.size();
-      while ((TNPad.length() + TNL) < 18)
-        TNPad += " ";
       outs() << PaddedName << "|" << SymbolAddrStr << "|   " << I->TypeChar
-             << "  |" << TNPad << I->TypeName << "|" << SymbolSizeStr
-             << "|     |" << I->SectionName << "\n";
+             << "  |                  |" << SymbolSizeStr << "|     |\n";
     }
   }
 
@@ -1085,37 +1078,7 @@ static bool isObject(SymbolicFile &Obj, basic_symbol_iterator I) {
              : elf_symbol_iterator(I)->getELFType() == ELF::STT_OBJECT;
 }
 
-// For ELF object files, Set TypeName to the symbol typename, to be printed
-// in the 'Type' column of the SYSV format output.
-static void getNMTypeName(SymbolicFile &Obj, basic_symbol_iterator I,
-                          StringRef &TypeName) {
-  if (isa<ELFObjectFileBase>(&Obj)) {
-    elf_symbol_iterator SymI(I);
-    SymI->getELFTypeName(TypeName);
-  }
-}
-
-// Return Posix nm class type tag (single letter), but also set SecName and
-// section and name, to be used in format=sysv output.
-static char getNMClassTagAndSectionName(SymbolicFile &Obj,
-                                        basic_symbol_iterator I,
-                                        StringRef &SecName) {
-  if (isa<ELFObjectFileBase>(&Obj)) {
-    elf_symbol_iterator SymI(I);
-
-    Expected<elf_section_iterator> SecIOrErr = SymI->getSection();
-    if (!SecIOrErr) {
-      consumeError(SecIOrErr.takeError());
-      return '?';
-    }
-    int SI = SymI->getSectionIndex();
-    if (SI == 0) {
-      SecName = "*UND*";
-    } else {
-      elf_section_iterator secT = *SecIOrErr;
-      secT->getName(SecName);
-    }
-  }
+static char getNMTypeChar(SymbolicFile &Obj, basic_symbol_iterator I) {
   uint32_t Symflags = I->getFlags();
   if ((Symflags & object::SymbolRef::SF_Weak) && !isa<MachOObjectFile>(Obj)) {
     char Ret = isObject(Obj, I) ? 'v' : 'w';
@@ -1125,10 +1088,8 @@ static char getNMClassTagAndSectionName(SymbolicFile &Obj,
   if (Symflags & object::SymbolRef::SF_Undefined)
     return 'U';
 
-  if (Symflags & object::SymbolRef::SF_Common) {
-    SecName = "*COM*";
+  if (Symflags & object::SymbolRef::SF_Common)
     return 'C';
-  }
 
   char Ret = '?';
   if (Symflags & object::SymbolRef::SF_Absolute)
@@ -1240,8 +1201,7 @@ dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName,
         }
         S.Address = *AddressOrErr;
       }
-      getNMTypeName(Obj, Sym, S.TypeName);
-      S.TypeChar = getNMClassTagAndSectionName(Obj, Sym, S.SectionName);
+      S.TypeChar = getNMTypeChar(Obj, Sym);
       std::error_code EC = Sym.printName(OS);
       if (EC && MachO)
         OS << "bad string index";

diff --git a/tools/llvm-readobj/ELFDumper.cpp b/tools/llvm-readobj/ELFDumper.cpp
index 53c390cffe4e68543cc93ea0f4c9397abf0543ee..ae2ac56e991fc6118d8de6f50270062d52f56a4c 100644 (file)
--- a/tools/llvm-readobj/ELFDumper.cpp
+++ b/tools/llvm-readobj/ELFDumper.cpp
@@ -1104,6 +1104,16 @@ static const EnumEntry<unsigned> ElfSymbolVisibilities[] = {
     {"HIDDEN",    "HIDDEN",    ELF::STV_HIDDEN},
     {"PROTECTED", "PROTECTED", ELF::STV_PROTECTED}};
 
+static const EnumEntry<unsigned> ElfSymbolTypes[] = {
+    {"None",      "NOTYPE",  ELF::STT_NOTYPE},
+    {"Object",    "OBJECT",  ELF::STT_OBJECT},
+    {"Function",  "FUNC",    ELF::STT_FUNC},
+    {"Section",   "SECTION", ELF::STT_SECTION},
+    {"File",      "FILE",    ELF::STT_FILE},
+    {"Common",    "COMMON",  ELF::STT_COMMON},
+    {"TLS",       "TLS",     ELF::STT_TLS},
+    {"GNU_IFunc", "IFUNC",   ELF::STT_GNU_IFUNC}};
+
 static const EnumEntry<unsigned> AMDGPUSymbolTypes[] = {
   { "AMDGPU_HSA_KERNEL",            ELF::STT_AMDGPU_HSA_KERNEL }
 };