From 91c603bcfe810c14ddcf7bf340dacbf10c7b5255 Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Wed, 21 Sep 2011 18:18:53 +0000
Subject: llvm-objdump: Take the data from the right object when there's no
 dSYM around.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@140269 91177308-0d34-0410-b5e6-96231b3b80d8
---
 tools/llvm-objdump/MachODump.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'tools/llvm-objdump')

diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp
index 0daf9d4214..22eaab7de0 100644
--- a/tools/llvm-objdump/MachODump.cpp
+++ b/tools/llvm-objdump/MachODump.cpp
@@ -347,6 +347,7 @@ void llvm::DisassembleInputMachO(StringRef Filename) {
             DebugLineSection, DebugStrSection;
   OwningPtr<DIContext> diContext;
   OwningPtr<MachOObject> DSYMObj;
+  MachOObject *DbgInfoObj = MachOObj.get();
   // Try to find debug info and set up the DIContext for it.
   if (UseDbg) {
     ArrayRef<Section> DebugSections = Sections;
@@ -368,29 +369,30 @@ void llvm::DisassembleInputMachO(StringRef Filename) {
       getSectionsAndSymbols(Header, DSYMObj.get(), 0, DSYMSections, Symbols,
                             FoundFns);
       DebugSections = DSYMSections;
+      DbgInfoObj = DSYMObj.get();
     }
 
     // Find the named debug info sections.
     for (unsigned SectIdx = 0; SectIdx != DebugSections.size(); SectIdx++) {
       if (!strcmp(DebugSections[SectIdx].Name, "__debug_abbrev"))
-        DebugAbbrevSection = DSYMObj->getData(DebugSections[SectIdx].Offset,
-                                              DebugSections[SectIdx].Size);
+        DebugAbbrevSection = DbgInfoObj->getData(DebugSections[SectIdx].Offset,
+                                                 DebugSections[SectIdx].Size);
       else if (!strcmp(DebugSections[SectIdx].Name, "__debug_info"))
-        DebugInfoSection = DSYMObj->getData(DebugSections[SectIdx].Offset,
-                                            DebugSections[SectIdx].Size);
-      else if (!strcmp(DebugSections[SectIdx].Name, "__debug_aranges"))
-        DebugArangesSection = DSYMObj->getData(DebugSections[SectIdx].Offset,
+        DebugInfoSection = DbgInfoObj->getData(DebugSections[SectIdx].Offset,
                                                DebugSections[SectIdx].Size);
+      else if (!strcmp(DebugSections[SectIdx].Name, "__debug_aranges"))
+        DebugArangesSection = DbgInfoObj->getData(DebugSections[SectIdx].Offset,
+                                                  DebugSections[SectIdx].Size);
       else if (!strcmp(DebugSections[SectIdx].Name, "__debug_line"))
-        DebugLineSection = DSYMObj->getData(DebugSections[SectIdx].Offset,
-                                            DebugSections[SectIdx].Size);
+        DebugLineSection = DbgInfoObj->getData(DebugSections[SectIdx].Offset,
+                                               DebugSections[SectIdx].Size);
       else if (!strcmp(DebugSections[SectIdx].Name, "__debug_str"))
-        DebugStrSection = DSYMObj->getData(DebugSections[SectIdx].Offset,
-                                           DebugSections[SectIdx].Size);
+        DebugStrSection = DbgInfoObj->getData(DebugSections[SectIdx].Offset,
+                                              DebugSections[SectIdx].Size);
     }
 
     // Setup the DIContext.
-    diContext.reset(DIContext::getDWARFContext(MachOObj->isLittleEndian(),
+    diContext.reset(DIContext::getDWARFContext(DbgInfoObj->isLittleEndian(),
                                                DebugInfoSection,
                                                DebugAbbrevSection,
                                                DebugArangesSection,
-- 
cgit v1.2.3