diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/test/tools/llvm-objdump/invalid-input.test | 3 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/MachODump.cpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/llvm/test/tools/llvm-objdump/invalid-input.test b/llvm/test/tools/llvm-objdump/invalid-input.test index 20a901d0b2d..d9bf7399755 100644 --- a/llvm/test/tools/llvm-objdump/invalid-input.test +++ b/llvm/test/tools/llvm-objdump/invalid-input.test @@ -4,3 +4,6 @@ NO_SUCH_FILE: '{{.*}}missing-file': RUN: not llvm-objdump -t %s 2>&1 | FileCheck %s -check-prefix=UNKNOWN_FILE_TYPE UNKNOWN_FILE_TYPE: '{{.*}}invalid-input.test': The file was not recognized as a valid object file + +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 +UNKNOWN_FILE_TYPE_DSYM: {{.*}}llvm-objdump: error: diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index 142ad8f6371..4198ff07ecb 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -6977,8 +6977,9 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF, Expected<std::unique_ptr<MachOObjectFile>> DbgObjCheck = ObjectFile::createMachOObjectFile(BufOrErr.get()->getMemBufferRef()); - if (DbgObjCheck.takeError()) - report_error(MachOOF->getFileName(), DbgObjCheck.takeError()); + if (Error E = DbgObjCheck.takeError()) + report_error(MachOOF->getFileName(), std::move(E)); + DbgObj = DbgObjCheck.get().release(); // We need to keep the file alive, because we're replacing DbgObj with it. DSYMBuf = std::move(BufOrErr.get()); |
