diff options
| author | Kevin Enderby <enderby@apple.com> | 2015-10-21 17:13:20 +0000 |
|---|---|---|
| committer | Kevin Enderby <enderby@apple.com> | 2015-10-21 17:13:20 +0000 |
| commit | da9dd05011be9f9d6576299a24aee639d212faff (patch) | |
| tree | 908d4c7021df8da6f3f53a77b4cc630fd9806d4e /llvm/tools/llvm-objdump/llvm-objdump.cpp | |
| parent | 6e91c598b9f3b2fa5f7cfd158cb6eebb6a6ae8f4 (diff) | |
| download | bcm5719-llvm-da9dd05011be9f9d6576299a24aee639d212faff.tar.gz bcm5719-llvm-da9dd05011be9f9d6576299a24aee639d212faff.zip | |
Backing out commit r250906 as it broke lld.
llvm-svn: 250908
Diffstat (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp')
| -rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
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) |
