diff options
| author | Francis Visoiu Mistrih <francisvm@yahoo.com> | 2019-01-10 17:16:42 +0000 |
|---|---|---|
| committer | Francis Visoiu Mistrih <francisvm@yahoo.com> | 2019-01-10 17:16:42 +0000 |
| commit | 1b427d4dba7f8ce537452a2cd9bd7835438f6aff (patch) | |
| tree | 708312e6dd05a45875d3f0c199421faef8900461 | |
| parent | 9f4f01182e4e4883559ef568baf1d7a315f6c93b (diff) | |
| download | bcm5719-llvm-1b427d4dba7f8ce537452a2cd9bd7835438f6aff.tar.gz bcm5719-llvm-1b427d4dba7f8ce537452a2cd9bd7835438f6aff.zip | |
[llvm-objdump][MachO] Use the -dsym file name when reporting errors
Instead of using the binary filename.
llvm-svn: 350849
| -rw-r--r-- | llvm/test/tools/llvm-objdump/invalid-input.test | 7 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/MachODump.cpp | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/llvm/test/tools/llvm-objdump/invalid-input.test b/llvm/test/tools/llvm-objdump/invalid-input.test index d9bf7399755..7e6c806cdcd 100644 --- a/llvm/test/tools/llvm-objdump/invalid-input.test +++ b/llvm/test/tools/llvm-objdump/invalid-input.test @@ -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 diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index 4198ff07ecb..a8e90dfdde2 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -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. |
