Replace a few more MachO only uses of getSymbolAddress.

[oota-llvm.git] / tools / dsymutil / MachODebugMapParser.cpp

diff --git a/tools/dsymutil/MachODebugMapParser.cpp b/tools/dsymutil/MachODebugMapParser.cpp
index c58545aec999e8f20d4720bd6b6e0e85a8a6a474..bec95915a0fb4c39de78262cc298de6ab2050b3f 100644 (file)
--- a/tools/dsymutil/MachODebugMapParser.cpp
+++ b/tools/dsymutil/MachODebugMapParser.cpp
@@ -198,8 +198,8 @@ void MachODebugMapParser::loadCurrentObjectFileSymbols() {
 
   for (auto Sym : CurrentObjectHolder.Get().symbols()) {
 
 
   for (auto Sym : CurrentObjectHolder.Get().symbols()) {
 

-    uint64_t Addr;
-    if (Sym.getAddress(Addr) || Addr == UnknownAddress)
+    uint64_t Addr = Sym.getValue();
+    if (Addr == UnknownAddress)

       continue;
     ErrorOr<StringRef> Name = Sym.getName();
     if (!Name)
       continue;
     ErrorOr<StringRef> Name = Sym.getName();
     if (!Name)


@@ -228,14 +228,13 @@ void MachODebugMapParser::loadMainBinarySymbols() {
     // Skip undefined and STAB entries.
     if ((Type & SymbolRef::ST_Debug) || (Type & SymbolRef::ST_Unknown))
       continue;
     // Skip undefined and STAB entries.
     if ((Type & SymbolRef::ST_Debug) || (Type & SymbolRef::ST_Unknown))
       continue;

-    uint64_t Addr;
+    uint64_t Addr = Sym.getValue();

     // The only symbols of interest are the global variables. These
     // are the only ones that need to be queried because the address
     // of common data won't be described in the debug map. All other
     // addresses should be fetched for the debug map.
     // The only symbols of interest are the global variables. These
     // are the only ones that need to be queried because the address
     // of common data won't be described in the debug map. All other
     // addresses should be fetched for the debug map.

-    if (Sym.getAddress(Addr) || Addr == UnknownAddress ||
-        !(Sym.getFlags() & SymbolRef::SF_Global) || Sym.getSection(Section) ||
-        Section->isText())
+    if (Addr == UnknownAddress || !(Sym.getFlags() & SymbolRef::SF_Global) ||
+        Sym.getSection(Section) || Section->isText())

       continue;
     ErrorOr<StringRef> NameOrErr = Sym.getName();
     if (!NameOrErr)
       continue;
     ErrorOr<StringRef> NameOrErr = Sym.getName();
     if (!NameOrErr)