diff options
Diffstat (limited to 'llvm/tools/llvm-objdump')
| -rw-r--r-- | llvm/tools/llvm-objdump/MachODump.cpp | 28 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 2 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.h | 1 |
3 files changed, 10 insertions, 21 deletions
diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index b270057151e..61567436a1c 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -1495,11 +1495,8 @@ void llvm::ParseInputMachO(StringRef Filename) { printArchiveHeaders(A, !NonVerbose, ArchiveMemberOffsets); for (Archive::child_iterator I = A->child_begin(), E = A->child_end(); I != E; ++I) { - if (std::error_code EC = I->getError()) { - errs() << "llvm-objdump: '" << Filename << "': " << EC.message() - << ".\n"; - exit(1); - } + if (std::error_code EC = I->getError()) + report_error(Filename, EC); auto &C = I->get(); ErrorOr<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary(); if (ChildOrErr.getError()) @@ -1549,11 +1546,8 @@ void llvm::ParseInputMachO(StringRef Filename) { for (Archive::child_iterator AI = A->child_begin(), AE = A->child_end(); AI != AE; ++AI) { - if (std::error_code EC = AI->getError()) { - errs() << "llvm-objdump: '" << Filename - << "': " << EC.message() << ".\n"; - exit(1); - } + if (std::error_code EC = AI->getError()) + report_error(Filename, EC); auto &C = AI->get(); ErrorOr<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary(); if (ChildOrErr.getError()) @@ -1597,11 +1591,8 @@ void llvm::ParseInputMachO(StringRef Filename) { for (Archive::child_iterator AI = A->child_begin(), AE = A->child_end(); AI != AE; ++AI) { - if (std::error_code EC = AI->getError()) { - errs() << "llvm-objdump: '" << Filename << "': " << EC.message() - << ".\n"; - exit(1); - } + if (std::error_code EC = AI->getError()) + report_error(Filename, EC); auto &C = AI->get(); ErrorOr<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary(); if (ChildOrErr.getError()) @@ -1639,11 +1630,8 @@ void llvm::ParseInputMachO(StringRef Filename) { printArchiveHeaders(A.get(), !NonVerbose, ArchiveMemberOffsets); for (Archive::child_iterator AI = A->child_begin(), AE = A->child_end(); AI != AE; ++AI) { - if (std::error_code EC = AI->getError()) { - errs() << "llvm-objdump: '" << Filename << "': " << EC.message() - << ".\n"; - exit(1); - } + if (std::error_code EC = AI->getError()) + report_error(Filename, EC); auto &C = AI->get(); ErrorOr<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary(); if (ChildOrErr.getError()) diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 069425429d1..a2c43e11a78 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -252,7 +252,7 @@ void llvm::error(std::error_code EC) { exit(1); } -static void report_error(StringRef File, std::error_code EC) { +void llvm::report_error(StringRef File, std::error_code EC) { assert(EC); errs() << ToolName << ": '" << File << "': " << EC.message() << ".\n"; exit(1); diff --git a/llvm/tools/llvm-objdump/llvm-objdump.h b/llvm/tools/llvm-objdump/llvm-objdump.h index 3c5e7b36582..f74ed010d1d 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.h +++ b/llvm/tools/llvm-objdump/llvm-objdump.h @@ -78,6 +78,7 @@ void PrintRelocations(const object::ObjectFile *o); void PrintSectionHeaders(const object::ObjectFile *o); void PrintSectionContents(const object::ObjectFile *o); void PrintSymbolTable(const object::ObjectFile *o); +void report_error(StringRef File, std::error_code EC); } // end namespace llvm |
