RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-03 10:54:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[llvm-objdump][MachO] Correctly handle the llvm::Error when -dsym has errors

Browse Source 
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.

llvm-svn: 350848
This commit is contained in:
Francis Visoiu Mistrih 2019-01-10 17:16:37 +00:00
parent e33fe36063
commit e911a16fb9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/tools/llvm-objdump/invalid-input.test
View File

@ -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:

5
tools/llvm-objdump/MachODump.cpp
View File

@ -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());