diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2011-09-21 18:18:53 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2011-09-21 18:18:53 +0000 |
| commit | 91c603bcfe810c14ddcf7bf340dacbf10c7b5255 (patch) | |
| tree | a44527edc7dda66740079603cec4e4610d07a93d | |
| parent | 519020adf1cf57e2e93cc4fd49c385c47f7ff0f7 (diff) | |
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
| -rw-r--r-- | tools/llvm-objdump/MachODump.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
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, |