summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-objdump/MachODump.cpp
diff options
context:
space:
mode:
authorFrancis Visoiu Mistrih <francisvm@yahoo.com>2019-01-10 17:36:54 +0000
committerFrancis Visoiu Mistrih <francisvm@yahoo.com>2019-01-10 17:36:54 +0000
commitb8819dc1e3cd59619b21276f0207e5377353db70 (patch)
treeb8c39f5b463471db7e72e9d71a45e29d4eff25fa /llvm/tools/llvm-objdump/MachODump.cpp
parent4d8c8fe62e8d8b679f91035fa0d2f3051d0f746f (diff)
downloadbcm5719-llvm-b8819dc1e3cd59619b21276f0207e5377353db70.tar.gz
bcm5719-llvm-b8819dc1e3cd59619b21276f0207e5377353db70.zip
[llvm-objdump][MachO] Fix error reporting after r350848 and r350849
llvm-svn: 350851
Diffstat (limited to 'llvm/tools/llvm-objdump/MachODump.cpp')
-rw-r--r--llvm/tools/llvm-objdump/MachODump.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
index a8e90dfdde2..397573e2a48 100644
--- a/llvm/tools/llvm-objdump/MachODump.cpp
+++ b/llvm/tools/llvm-objdump/MachODump.cpp
@@ -6970,15 +6970,17 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF,
ErrorOr<std::unique_ptr<MemoryBuffer>> BufOrErr =
MemoryBuffer::getFileOrSTDIN(DSYMFile);
if (std::error_code EC = BufOrErr.getError()) {
- WithColor::error(errs(), "llvm-objdump")
- << DSYMFile << ": " << EC.message() << '\n';
+ report_error(DSYMFile, errorCodeToError(EC));
return;
}
+
Expected<std::unique_ptr<MachOObjectFile>> DbgObjCheck =
ObjectFile::createMachOObjectFile(BufOrErr.get()->getMemBufferRef());
- if (Error E = DbgObjCheck.takeError())
+ if (Error E = DbgObjCheck.takeError()) {
report_error(DSYMFile, std::move(E));
+ return;
+ }
DbgObj = DbgObjCheck.get().release();
// We need to keep the file alive, because we're replacing DbgObj with it.
OpenPOWER on IntegriCloud