From c54f433f459f73a8df12c7d2fd165ac42d936e4a Mon Sep 17 00:00:00 2001 From: Francis Visoiu Mistrih Date: Thu, 10 Jan 2019 17:16:37 +0000 Subject: [PATCH] [llvm-objdump][MachO] Correctly handle the llvm::Error when -dsym has errors In an assert build, the Error gets destroyed and we get "Program aborted due to an unhandled Error:". In release, we get an empty message. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@350848 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/tools/llvm-objdump/invalid-input.test | 3 +++ tools/llvm-objdump/MachODump.cpp | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/tools/llvm-objdump/invalid-input.test b/test/tools/llvm-objdump/invalid-input.test index 20a901d0b2d..d9bf7399755 100644 --- a/test/tools/llvm-objdump/invalid-input.test +++ b/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/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp index 142ad8f6371..4198ff07ecb 100644 --- a/tools/llvm-objdump/MachODump.cpp +++ b/tools/llvm-objdump/MachODump.cpp @@ -6977,8 +6977,9 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF, Expected> 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()); -- 2.50.1