Revert "Don't use getSymbolNMTypeChar for implementing COFFObjectFile::getSymbolFileO...

Investigating a bot failure.

This reverts commit r193928.

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

diff --git a/lib/Object/COFFObjectFile.cpp b/lib/Object/COFFObjectFile.cpp
index 2952d44b21e73f7e6581f41d36397b5abf64f272..3d1e62e1e5576f2eee3103909fc8d1c13efc0326 100644 (file)
--- a/lib/Object/COFFObjectFile.cpp
+++ b/lib/Object/COFFObjectFile.cpp
@@ -112,8 +112,10 @@ error_code COFFObjectFile::getSymbolFileOffset(DataRefImpl Symb,
   const coff_section *Section = NULL;
   if (error_code ec = getSection(symb->SectionNumber, Section))
     return ec;
-
-  if (symb->SectionNumber == COFF::IMAGE_SYM_UNDEFINED && symb->Value != 0)
+  char Type;
+  if (error_code ec = getSymbolNMTypeChar(Symb, Type))
+    return ec;
+  if (Type == 'U' || Type == 'w')
     Result = UnknownAddressOrSize;
   else if (Section)
     Result = Section->PointerToRawData + symb->Value;