RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

[llvm-objdump][MachO] Use the -dsym file name when reporting errors

Browse Source 
Instead of using the binary filename.

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

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

@ -7,3 +7,10 @@ UNKNOWN_FILE_TYPE: '{{.*}}invalid-input.test': The file was not recognized as a
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:
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:
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

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

@ -6971,14 +6971,14 @@ static void DisassembleMachO(StringRef Filename, MachOObjectFile *MachOOF,
MemoryBuffer::getFileOrSTDIN(DSYMFile);
if (std::error_code EC = BufOrErr.getError()) {
WithColor::error(errs(), "llvm-objdump")
<< Filename << ": " << EC.message() << '\n';
<< DSYMFile << ": " << EC.message() << '\n';
return;
}
Expected<std::unique_ptr<MachOObjectFile>> DbgObjCheck =
ObjectFile::createMachOObjectFile(BufOrErr.get()->getMemBufferRef());
if (Error E = DbgObjCheck.takeError())
report_error(MachOOF->getFileName(), std::move(E));
report_error(DSYMFile, std::move(E));
DbgObj = DbgObjCheck.get().release();
// We need to keep the file alive, because we're replacing DbgObj with it.