From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Sat, 2 Nov 2013 17:12:49 +0000 (+0000)
Subject: Revert "Don't use getSymbolNMTypeChar for implementing COFFObjectFile::getSymbolFileO... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7e56fc6ae19e353ebdfaf327b46121b519a0c264;p=oota-llvm.git

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

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 2952d44b21e..3d1e62e1e55 100644
--- 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;