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

[Francis Visoiu Mistrih via llvm-commits]

Author: thegameg
Date: Thu Jan 10 09:16:42 2019
New Revision: 350849

URL: http://llvm.org/viewvc/llvm-project?rev=350849&view=rev
Log:
[llvm-objdump][MachO] Use the -dsym file name when reporting errors

Instead of using the binary filename.

Modified:
    llvm/trunk/test/tools/llvm-objdump/invalid-input.test
    llvm/trunk/tools/llvm-objdump/MachODump.cpp

Modified: llvm/trunk/test/tools/llvm-objdump/invalid-input.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/invalid-input.test?rev=350849&r1=350848&r2=350849&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/invalid-input.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/invalid-input.test Thu Jan 10 09:16:42 2019
@@ -7,3 +7,10 @@ UNKNOWN_FILE_TYPE: '{{.*}}invalid-input.
 
 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

Modified: llvm/trunk/tools/llvm-objdump/MachODump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/MachODump.cpp?rev=350849&r1=350848&r2=350849&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/MachODump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/MachODump.cpp Thu Jan 10 09:16:42 2019
@@ -6971,14 +6971,14 @@ static void DisassembleMachO(StringRef F
           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.