[llvm-objdump][MachO] Fix error reporting after r350848 and r350849
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@350851 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/tools/llvm-objdump/invalid-input.test b/test/tools/llvm-objdump/invalid-input.test
index 7e6c806..89ac352 100644
--- a/test/tools/llvm-objdump/invalid-input.test
+++ b/test/tools/llvm-objdump/invalid-input.test
@@ -9,8 +9,7 @@
UNKNOWN_FILE_TYPE_DSYM: {{.*}}llvm-objdump: error:
RUN: not llvm-objdump -macho -disassemble -g -dsym=%p/missing-dsym %p/Inputs/bind.macho-x86_64 2>&1 | FileCheck %s -check-prefix=NO_SUCH_FILE_DSYM
-NO_SUCH_FILE_DSYM: error: {{.*}}missing-dsym:
+NO_SUCH_FILE_DSYM: error: '{{.*}}missing-dsym':
RUN: not llvm-objdump -macho -disassemble -g -dsym=%s %p/Inputs/bind.macho-x86_64 2>&1 | FileCheck %s -check-prefix=UNKNOWN_FILE_TYPE_DSYM_MSG
-UNKNOWN_FILE_TYPE_DSYM_MSG: {{.*}}llvm-objdump: error:
-UNKNOWN_FILE_TYPE_DSYM_MSG-NOT: bind.macho-x86_64
+UNKNOWN_FILE_TYPE_DSYM_MSG: error: '{{.*}}.test'
diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp
index a8e90df..397573e 100644
--- a/tools/llvm-objdump/MachODump.cpp
+++ b/tools/llvm-objdump/MachODump.cpp
@@ -6970,15 +6970,17 @@
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.
