diff options
Diffstat (limited to 'llvm/tools/llvm-objdump')
| -rw-r--r-- | llvm/tools/llvm-objdump/MachODump.cpp | 37 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 7 |
2 files changed, 10 insertions, 34 deletions
diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index 95869f2b952..6b70c011c02 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -1417,11 +1417,8 @@ static void printArchiveChild(Archive::Child &C, bool verbose, outs() << format("%3d/", UID); unsigned GID = C.getGID(); outs() << format("%-3d ", GID); - ErrorOr<uint64_t> Size = C.getRawSize(); - if (Size.getError()) - outs() << "bad size" << " "; - else - outs() << format("%5" PRId64, Size.get()) << " "; + uint64_t Size = C.getRawSize(); + outs() << format("%5" PRId64, Size) << " "; StringRef RawLastModified = C.getRawLastModified(); if (verbose) { @@ -1457,16 +1454,12 @@ static void printArchiveChild(Archive::Child &C, bool verbose, static void printArchiveHeaders(Archive *A, bool verbose, bool print_offset) { if (A->hasSymbolTable()) { Archive::child_iterator S = A->getSymbolTableChild(); - if (!S->getError()) { - Archive::Child C = S->get(); - printArchiveChild(C, verbose, print_offset); - } + Archive::Child C = *S; + printArchiveChild(C, verbose, print_offset); } for (Archive::child_iterator I = A->child_begin(), E = A->child_end(); I != E; ++I) { - if(I->getError()) - break; - Archive::Child C = I->get(); + Archive::Child C = *I; printArchiveChild(C, verbose, print_offset); } } @@ -1503,10 +1496,7 @@ 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 (I->getError()) - break; - auto &C = I->get(); - ErrorOr<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary(); + ErrorOr<std::unique_ptr<Binary>> ChildOrErr = I->getAsBinary(); if (ChildOrErr.getError()) continue; if (MachOObjectFile *O = dyn_cast<MachOObjectFile>(&*ChildOrErr.get())) { @@ -1554,10 +1544,7 @@ void llvm::ParseInputMachO(StringRef Filename) { for (Archive::child_iterator AI = A->child_begin(), AE = A->child_end(); AI != AE; ++AI) { - if (AI->getError()) - break; - auto &C = AI->get(); - ErrorOr<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary(); + ErrorOr<std::unique_ptr<Binary>> ChildOrErr = AI->getAsBinary(); if (ChildOrErr.getError()) continue; if (MachOObjectFile *O = @@ -1599,10 +1586,7 @@ void llvm::ParseInputMachO(StringRef Filename) { for (Archive::child_iterator AI = A->child_begin(), AE = A->child_end(); AI != AE; ++AI) { - if (AI->getError()) - break; - auto &C = AI->get(); - ErrorOr<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary(); + ErrorOr<std::unique_ptr<Binary>> ChildOrErr = AI->getAsBinary(); if (ChildOrErr.getError()) continue; if (MachOObjectFile *O = @@ -1638,10 +1622,7 @@ 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 (AI->getError()) - break; - auto &C = AI->get(); - ErrorOr<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary(); + ErrorOr<std::unique_ptr<Binary>> ChildOrErr = AI->getAsBinary(); if (ChildOrErr.getError()) continue; if (MachOObjectFile *O = diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 34401937bd8..7292841c55a 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -1536,12 +1536,7 @@ static void DumpObject(const ObjectFile *o) { /// @brief Dump each object file in \a a; static void DumpArchive(const Archive *a) { - for (auto &ErrorOrChild : a->children()) { - if (std::error_code EC = ErrorOrChild.getError()) { - report_error(a->getFileName(), EC); - break; - } - const Archive::Child &C = *ErrorOrChild; + for (const Archive::Child &C : a->children()) { ErrorOr<std::unique_ptr<Binary>> ChildOrErr = C.getAsBinary(); if (std::error_code EC = ChildOrErr.getError()) if (EC != object_error::invalid_file_type) |
