From ae610ab528a382a393aae26d2d67cee05cabe634 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Thu, 14 Jul 2016 00:37:04 +0000 Subject: [PATCH] [Object] Revert r275316, Archive::child_iterator changes, while I update lld. Should fix the bots broken by r275316. llvm-svn: 275353 --- llvm/include/llvm/Object/Archive.h | 41 +++++----- llvm/include/llvm/Support/Error.h | 5 -- llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp | 9 +-- .../ExecutionEngine/Orc/OrcMCJITReplacement.h | 9 +-- llvm/lib/Object/Archive.cpp | 48 ++++++------ llvm/lib/Support/Error.cpp | 11 --- llvm/tools/dsymutil/BinaryHolder.cpp | 8 +- llvm/tools/llvm-ar/llvm-ar.cpp | 66 ++++++++-------- llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp | 14 +--- llvm/tools/llvm-nm/llvm-nm.cpp | 76 ++++++++++--------- llvm/tools/llvm-objdump/MachODump.cpp | 48 +++++++----- llvm/tools/llvm-objdump/llvm-objdump.cpp | 8 +- llvm/tools/llvm-readobj/llvm-readobj.cpp | 19 +---- llvm/tools/llvm-size/llvm-size.cpp | 54 +++++++------ llvm/tools/sancov/sancov.cc | 17 ++--- 15 files changed, 197 insertions(+), 236 deletions(-) diff --git a/llvm/include/llvm/Object/Archive.h b/llvm/include/llvm/Object/Archive.h index f209cb323511..77538cb5323a 100644 --- a/llvm/include/llvm/Object/Archive.h +++ b/llvm/include/llvm/Object/Archive.h @@ -106,20 +106,21 @@ public: }; class child_iterator { - Child C; - Error *E; + ErrorOr child; public: - child_iterator() : C(Child(nullptr, nullptr, nullptr)), E(nullptr) {} - child_iterator(const Child &C, Error *E) : C(C), E(E) {} - const Child *operator->() const { return &C; } - const Child &operator*() const { return C; } + child_iterator() : child(Child(nullptr, nullptr, nullptr)) {} + child_iterator(const Child &c) : child(c) {} + child_iterator(std::error_code EC) : child(EC) {} + const ErrorOr *operator->() const { return &child; } + const ErrorOr &operator*() const { return child; } bool operator==(const child_iterator &other) const { - // Ignore errors here: If an error occurred during increment then getNext - // will have been set to child_end(), and the following comparison should - // do the right thing. - return C == other.C; + // We ignore error states so that comparisions with end() work, which + // allows range loops. + if (child.getError() || other.child.getError()) + return false; + return *child == *other.child; } bool operator!=(const child_iterator &other) const { @@ -129,15 +130,8 @@ public: // Code in loops with child_iterators must check for errors on each loop // iteration. And if there is an error break out of the loop. child_iterator &operator++() { // Preincrement - assert(E && "Can't increment iterator with no Error attached"); - if (auto ChildOrErr = C.getNext()) - C = *ChildOrErr; - else { - ErrorAsOutParameter ErrAsOutParam(*E); - C = C.getParent()->child_end().C; - *E = errorCodeToError(ChildOrErr.getError()); - E = nullptr; - } + assert(child && "Can't increment iterator with error"); + child = child->getNext(); return *this; } }; @@ -196,11 +190,10 @@ public: Kind kind() const { return (Kind)Format; } bool isThin() const { return IsThin; } - child_iterator child_begin(Error &Err, bool SkipInternal = true) const; + child_iterator child_begin(bool SkipInternal = true) const; child_iterator child_end() const; - iterator_range children(Error &Err, - bool SkipInternal = true) const { - return make_range(child_begin(Err, SkipInternal), child_end()); + iterator_range children(bool SkipInternal = true) const { + return make_range(child_begin(SkipInternal), child_end()); } symbol_iterator symbol_begin() const; @@ -215,7 +208,7 @@ public: } // check if a symbol is in the archive - child_iterator findSym(Error &Err, StringRef name) const; + child_iterator findSym(StringRef name) const; bool hasSymbolTable() const; StringRef getSymbolTable() const { return SymbolTable; } diff --git a/llvm/include/llvm/Support/Error.h b/llvm/include/llvm/Support/Error.h index 5f515a88a021..645088ceb679 100644 --- a/llvm/include/llvm/Support/Error.h +++ b/llvm/include/llvm/Support/Error.h @@ -940,11 +940,6 @@ private: std::function GetExitCode; }; -/// Report a serious error, calling any installed error handler. See -/// ErrorHandling.h. -LLVM_ATTRIBUTE_NORETURN void report_fatal_error(Error Err, - bool gen_crash_diag = true); - } // namespace llvm #endif // LLVM_SUPPORT_ERROR_H diff --git a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp index 9da0045d2019..30f18db0a467 100644 --- a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp +++ b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp @@ -327,14 +327,13 @@ RuntimeDyld::SymbolInfo MCJIT::findSymbol(const std::string &Name, for (object::OwningBinary &OB : Archives) { object::Archive *A = OB.getBinary(); // Look for our symbols in each Archive - Error Err; - object::Archive::child_iterator ChildIt = A->findSym(Err, Name); - if (Err) - report_fatal_error(std::move(Err)); + object::Archive::child_iterator ChildIt = A->findSym(Name); + if (std::error_code EC = ChildIt->getError()) + report_fatal_error(EC.message()); if (ChildIt != A->child_end()) { // FIXME: Support nested archives? Expected> ChildBinOrErr = - ChildIt->getAsBinary(); + (*ChildIt)->getAsBinary(); if (!ChildBinOrErr) { // TODO: Actually report errors helpfully. consumeError(ChildBinOrErr.takeError()); diff --git a/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h b/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h index 2fde56447fc1..5ab47b97dbd9 100644 --- a/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h +++ b/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h @@ -258,14 +258,13 @@ private: for (object::OwningBinary &OB : Archives) { object::Archive *A = OB.getBinary(); // Look for our symbols in each Archive - Error Err; - object::Archive::child_iterator ChildIt = A->findSym(Err, Name); - if (Err) - report_fatal_error(std::move(Err)); + object::Archive::child_iterator ChildIt = A->findSym(Name); + if (std::error_code EC = ChildIt->getError()) + report_fatal_error(EC.message()); if (ChildIt != A->child_end()) { // FIXME: Support nested archives? Expected> ChildBinOrErr = - ChildIt->getAsBinary(); + (*ChildIt)->getAsBinary(); if (!ChildBinOrErr) { // TODO: Actually report errors helpfully. consumeError(ChildBinOrErr.takeError()); diff --git a/llvm/lib/Object/Archive.cpp b/llvm/lib/Object/Archive.cpp index 4827e58f5d3e..4720bf894e99 100644 --- a/llvm/lib/Object/Archive.cpp +++ b/llvm/lib/Object/Archive.cpp @@ -298,9 +298,12 @@ Archive::Archive(MemoryBufferRef Source, Error &Err) } // Get the special members. - child_iterator I = child_begin(Err, false); - if (Err) + child_iterator I = child_begin(false); + std::error_code ec; + if ((ec = I->getError())) { + Err = errorCodeToError(ec); return; + } child_iterator E = child_end(); // This is at least a valid empty archive. Since an empty archive is the @@ -312,13 +315,13 @@ Archive::Archive(MemoryBufferRef Source, Error &Err) Err = Error::success(); return; } - const Child *C = &*I; + const Child *C = &**I; auto Increment = [&]() { ++I; - if (Err) + if ((Err = errorCodeToError(I->getError()))) return true; - C = &*I; + C = &**I; return false; }; @@ -363,7 +366,8 @@ Archive::Archive(MemoryBufferRef Source, Error &Err) Format = K_BSD; // We know this is BSD, so getName will work since there is no string table. ErrorOr NameOrErr = C->getName(); - if (auto ec = NameOrErr.getError()) { + ec = NameOrErr.getError(); + if (ec) { Err = errorCodeToError(ec); return; } @@ -461,29 +465,23 @@ Archive::Archive(MemoryBufferRef Source, Error &Err) Err = Error::success(); } -Archive::child_iterator Archive::child_begin(Error &Err, - bool SkipInternal) const { +Archive::child_iterator Archive::child_begin(bool SkipInternal) const { if (Data.getBufferSize() == 8) // empty archive. return child_end(); if (SkipInternal) - return child_iterator(Child(this, FirstRegularData, - FirstRegularStartOfFile), - &Err); + return Child(this, FirstRegularData, FirstRegularStartOfFile); const char *Loc = Data.getBufferStart() + strlen(Magic); std::error_code EC; - Child C(this, Loc, &EC); - if (EC) { - ErrorAsOutParameter ErrAsOutParam(Err); - Err = errorCodeToError(EC); - return child_end(); - } - return child_iterator(C, &Err); + Child c(this, Loc, &EC); + if (EC) + return child_iterator(EC); + return child_iterator(c); } Archive::child_iterator Archive::child_end() const { - return child_iterator(Child(this, nullptr, nullptr), nullptr); + return Child(this, nullptr, nullptr); } StringRef Archive::Symbol::getName() const { @@ -667,20 +665,18 @@ uint32_t Archive::getNumberOfSymbols() const { return read32le(buf); } -Archive::child_iterator Archive::findSym(Error &Err, StringRef name) const { +Archive::child_iterator Archive::findSym(StringRef name) const { Archive::symbol_iterator bs = symbol_begin(); Archive::symbol_iterator es = symbol_end(); for (; bs != es; ++bs) { StringRef SymName = bs->getName(); if (SymName == name) { - if (auto MemberOrErr = bs->getMember()) { - return child_iterator(*MemberOrErr, &Err); - } else { - ErrorAsOutParameter ErrAsOutParam(Err); - Err = errorCodeToError(MemberOrErr.getError()); + ErrorOr ResultOrErr = bs->getMember(); + // FIXME: Should we really eat the error? + if (ResultOrErr.getError()) return child_end(); - } + return ResultOrErr.get(); } } return child_end(); diff --git a/llvm/lib/Support/Error.cpp b/llvm/lib/Support/Error.cpp index 6b22691eb1ad..df540d10bc5b 100644 --- a/llvm/lib/Support/Error.cpp +++ b/llvm/lib/Support/Error.cpp @@ -64,7 +64,6 @@ void logAllUnhandledErrors(Error E, raw_ostream &OS, Twine ErrorBanner) { }); } - std::error_code ErrorList::convertToErrorCode() const { return std::error_code(static_cast(ErrorErrorCode::MultipleErrors), *ErrorErrorCat); @@ -100,14 +99,4 @@ std::error_code StringError::convertToErrorCode() const { return EC; } -void report_fatal_error(Error Err, bool GenCrashDiag) { - assert(Err && "report_fatal_error called with success value"); - std::string ErrMsg; - { - raw_string_ostream ErrStream(ErrMsg); - logAllUnhandledErrors(std::move(Err), ErrStream, ""); - } - report_fatal_error(ErrMsg); -} - } diff --git a/llvm/tools/dsymutil/BinaryHolder.cpp b/llvm/tools/dsymutil/BinaryHolder.cpp index e45f7fefe084..5b92bba11937 100644 --- a/llvm/tools/dsymutil/BinaryHolder.cpp +++ b/llvm/tools/dsymutil/BinaryHolder.cpp @@ -102,8 +102,10 @@ BinaryHolder::GetArchiveMemberBuffers(StringRef Filename, Buffers.reserve(CurrentArchives.size()); for (const auto &CurrentArchive : CurrentArchives) { - Error Err; - for (auto Child : CurrentArchive->children(Err)) { + for (auto ChildOrErr : CurrentArchive->children()) { + if (std::error_code Err = ChildOrErr.getError()) + return Err; + const auto &Child = *ChildOrErr; if (auto NameOrErr = Child.getName()) { if (*NameOrErr == Filename) { if (Timestamp != sys::TimeValue::PosixZeroTime() && @@ -121,8 +123,6 @@ BinaryHolder::GetArchiveMemberBuffers(StringRef Filename, } } } - if (Err) - return errorToErrorCode(std::move(Err)); } if (Buffers.empty()) diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index 865152b6af83..d52355216b0d 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -405,37 +405,35 @@ static void performReadOperation(ArchiveOperation Operation, fail("extracting from a thin archive is not supported"); bool Filter = !Members.empty(); - { - Error Err; - for (auto &C : OldArchive->children(Err)) { - ErrorOr NameOrErr = C.getName(); - failIfError(NameOrErr.getError()); - StringRef Name = NameOrErr.get(); + for (auto &ChildOrErr : OldArchive->children()) { + failIfError(ChildOrErr.getError()); + const object::Archive::Child &C = *ChildOrErr; - if (Filter) { - auto I = std::find(Members.begin(), Members.end(), Name); - if (I == Members.end()) - continue; - Members.erase(I); - } + ErrorOr NameOrErr = C.getName(); + failIfError(NameOrErr.getError()); + StringRef Name = NameOrErr.get(); - switch (Operation) { - default: - llvm_unreachable("Not a read operation"); - case Print: - doPrint(Name, C); - break; - case DisplayTable: - doDisplayTable(Name, C); - break; - case Extract: - doExtract(Name, C); - break; - } + if (Filter) { + auto I = std::find(Members.begin(), Members.end(), Name); + if (I == Members.end()) + continue; + Members.erase(I); } - failIfError(std::move(Err)); - } + switch (Operation) { + default: + llvm_unreachable("Not a read operation"); + case Print: + doPrint(Name, C); + break; + case DisplayTable: + doDisplayTable(Name, C); + break; + case Extract: + doExtract(Name, C); + break; + } + } if (Members.empty()) return; for (StringRef Name : Members) @@ -533,8 +531,9 @@ computeNewArchiveMembers(ArchiveOperation Operation, int InsertPos = -1; StringRef PosName = sys::path::filename(RelPos); if (OldArchive) { - Error Err; - for (auto &Child : OldArchive->children(Err)) { + for (auto &ChildOrErr : OldArchive->children()) { + failIfError(ChildOrErr.getError()); + auto &Child = ChildOrErr.get(); int Pos = Ret.size(); ErrorOr NameOrErr = Child.getName(); failIfError(NameOrErr.getError()); @@ -569,7 +568,6 @@ computeNewArchiveMembers(ArchiveOperation Operation, if (MemberI != Members.end()) Members.erase(MemberI); } - failIfError(std::move(Err)); } if (Operation == Delete) @@ -766,11 +764,9 @@ static void runMRIScript() { "Could not parse library"); Archives.push_back(std::move(*LibOrErr)); object::Archive &Lib = *Archives.back(); - { - Error Err; - for (auto &Member : Lib.children(Err)) - addMember(NewMembers, Member); - failIfError(std::move(Err)); + for (auto &MemberOrErr : Lib.children()) { + failIfError(MemberOrErr.getError()); + addMember(NewMembers, *MemberOrErr); } break; } diff --git a/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp b/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp index c92d20d6ccf1..0c408ccb5baa 100644 --- a/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp +++ b/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp @@ -50,14 +50,6 @@ static void error(std::error_code EC) { exit(1); } -static void error(Error Err) { - if (Err) { - logAllUnhandledErrors(std::move(Err), outs(), "Error reading file: "); - outs().flush(); - exit(1); - } -} - } // namespace llvm static void reportError(StringRef Input, StringRef Message) { @@ -490,8 +482,9 @@ static void dumpCXXData(const ObjectFile *Obj) { } static void dumpArchive(const Archive *Arc) { - Error Err; - for (auto &ArcC : Arc->children(Err)) { + for (auto &ErrorOrChild : Arc->children()) { + error(ErrorOrChild.getError()); + const Archive::Child &ArcC = *ErrorOrChild; Expected> ChildOrErr = ArcC.getAsBinary(); if (!ChildOrErr) { // Ignore non-object files. @@ -511,7 +504,6 @@ static void dumpArchive(const Archive *Arc) { else reportError(Arc->getFileName(), cxxdump_error::unrecognized_file_format); } - error(std::move(Err)); } static void dumpInput(StringRef File) { diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp index 9b2f5220badb..2cd0ede4a537 100644 --- a/llvm/tools/llvm-nm/llvm-nm.cpp +++ b/llvm/tools/llvm-nm/llvm-nm.cpp @@ -1109,31 +1109,30 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { } } - { - Error Err; - for (auto &C : A->children(Err)) { - Expected> ChildOrErr = C.getAsBinary(&Context); - if (!ChildOrErr) { - if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError())) - error(std::move(E), Filename, C); - continue; - } - if (SymbolicFile *O = dyn_cast(&*ChildOrErr.get())) { - if (!checkMachOAndArchFlags(O, Filename)) - return; - if (!PrintFileName) { - outs() << "\n"; - if (isa(O)) { - outs() << Filename << "(" << O->getFileName() << ")"; - } else - outs() << O->getFileName(); - outs() << ":\n"; - } - dumpSymbolNamesFromObject(*O, false, Filename); - } + for (Archive::child_iterator I = A->child_begin(), E = A->child_end(); + I != E; ++I) { + if (error(I->getError())) + return; + auto &C = I->get(); + Expected> ChildOrErr = C.getAsBinary(&Context); + if (!ChildOrErr) { + if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError())) + error(std::move(E), Filename, C); + continue; + } + if (SymbolicFile *O = dyn_cast(&*ChildOrErr.get())) { + if (!checkMachOAndArchFlags(O, Filename)) + return; + if (!PrintFileName) { + outs() << "\n"; + if (isa(O)) { + outs() << Filename << "(" << O->getFileName() << ")"; + } else + outs() << O->getFileName(); + outs() << ":\n"; + } + dumpSymbolNamesFromObject(*O, false, Filename); } - if (Err) - error(std::move(Err), A->getFileName()); } return; } @@ -1175,8 +1174,12 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { } else if (Expected> AOrErr = I->getAsArchive()) { std::unique_ptr &A = *AOrErr; - Error Err; - for (auto &C : A->children(Err)) { + for (Archive::child_iterator AI = A->child_begin(), + AE = A->child_end(); + AI != AE; ++AI) { + if (error(AI->getError())) + return; + auto &C = AI->get(); Expected> ChildOrErr = C.getAsBinary(&Context); if (!ChildOrErr) { @@ -1206,8 +1209,6 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { ArchitectureName); } } - if (Err) - error(std::move(Err), A->getFileName()); } else { consumeError(AOrErr.takeError()); error(Filename + " for architecture " + @@ -1246,8 +1247,12 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { } else if (Expected> AOrErr = I->getAsArchive()) { std::unique_ptr &A = *AOrErr; - Error Err; - for (auto &C : A->children(Err)) { + for (Archive::child_iterator AI = A->child_begin(), + AE = A->child_end(); + AI != AE; ++AI) { + if (error(AI->getError())) + return; + auto &C = AI->get(); Expected> ChildOrErr = C.getAsBinary(&Context); if (!ChildOrErr) { @@ -1267,8 +1272,6 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { dumpSymbolNamesFromObject(*O, false, ArchiveName); } } - if (Err) - error(std::move(Err), A->getFileName()); } else { consumeError(AOrErr.takeError()); error(Filename + " for architecture " + @@ -1313,8 +1316,11 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { } else if (Expected> AOrErr = I->getAsArchive()) { std::unique_ptr &A = *AOrErr; - Error Err; - for (auto &C : A->children(Err)) { + for (Archive::child_iterator AI = A->child_begin(), AE = A->child_end(); + AI != AE; ++AI) { + if (error(AI->getError())) + return; + auto &C = AI->get(); Expected> ChildOrErr = C.getAsBinary(&Context); if (!ChildOrErr) { @@ -1343,8 +1349,6 @@ static void dumpSymbolNamesFromFile(std::string &Filename) { dumpSymbolNamesFromObject(*O, false, ArchiveName, ArchitectureName); } } - if (Err) - error(std::move(Err), A->getFileName()); } else { consumeError(AOrErr.takeError()); error(Filename + " for architecture " + diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index 08bc1f482407..82e7f8a258b6 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -1535,11 +1535,13 @@ static void printArchiveChild(const Archive::Child &C, bool verbose, } static void printArchiveHeaders(Archive *A, bool verbose, bool print_offset) { - Error Err; - for (const auto &C : A->children(Err, false)) + for (Archive::child_iterator I = A->child_begin(false), E = A->child_end(); + I != E; ++I) { + if (std::error_code EC = I->getError()) + report_fatal_error(EC.message()); + const Archive::Child &C = **I; printArchiveChild(C, verbose, print_offset); - if (Err) - report_fatal_error(std::move(Err)); + } } // ParseInputMachO() parses the named Mach-O file in Filename and handles the @@ -1570,8 +1572,11 @@ void llvm::ParseInputMachO(StringRef Filename) { outs() << "Archive : " << Filename << "\n"; if (ArchiveHeaders) printArchiveHeaders(A, !NonVerbose, ArchiveMemberOffsets); - Error Err; - for (auto &C : A->children(Err)) { + for (Archive::child_iterator I = A->child_begin(), E = A->child_end(); + I != E; ++I) { + if (std::error_code EC = I->getError()) + report_error(Filename, EC); + auto &C = I->get(); Expected> ChildOrErr = C.getAsBinary(); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError())) @@ -1584,8 +1589,6 @@ void llvm::ParseInputMachO(StringRef Filename) { ProcessMachO(Filename, O, O->getFileName()); } } - if (Err) - report_error(Filename, std::move(Err)); return; } if (UniversalHeaders) { @@ -1627,8 +1630,12 @@ void llvm::ParseInputMachO(StringRef Filename) { outs() << "\n"; if (ArchiveHeaders) printArchiveHeaders(A.get(), !NonVerbose, ArchiveMemberOffsets); - Error Err; - for (auto &C : A->children(Err)) { + for (Archive::child_iterator AI = A->child_begin(), + AE = A->child_end(); + AI != AE; ++AI) { + if (std::error_code EC = AI->getError()) + report_error(Filename, EC); + auto &C = AI->get(); Expected> ChildOrErr = C.getAsBinary(); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError())) @@ -1639,8 +1646,6 @@ void llvm::ParseInputMachO(StringRef Filename) { dyn_cast(&*ChildOrErr.get())) ProcessMachO(Filename, O, O->getFileName(), ArchitectureName); } - if (Err) - report_error(Filename, std::move(Err)); } else { consumeError(AOrErr.takeError()); error("Mach-O universal file: " + Filename + " for " + @@ -1682,8 +1687,12 @@ void llvm::ParseInputMachO(StringRef Filename) { outs() << "Archive : " << Filename << "\n"; if (ArchiveHeaders) printArchiveHeaders(A.get(), !NonVerbose, ArchiveMemberOffsets); - Error Err; - for (auto &C : A->children(Err)) { + for (Archive::child_iterator AI = A->child_begin(), + AE = A->child_end(); + AI != AE; ++AI) { + if (std::error_code EC = AI->getError()) + report_error(Filename, EC); + auto &C = AI->get(); Expected> ChildOrErr = C.getAsBinary(); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError())) @@ -1694,8 +1703,6 @@ void llvm::ParseInputMachO(StringRef Filename) { dyn_cast(&*ChildOrErr.get())) ProcessMachO(Filename, O, O->getFileName()); } - if (Err) - report_error(Filename, std::move(Err)); } else { consumeError(AOrErr.takeError()); error("Mach-O universal file: " + Filename + " for architecture " + @@ -1733,8 +1740,11 @@ void llvm::ParseInputMachO(StringRef Filename) { outs() << "\n"; if (ArchiveHeaders) printArchiveHeaders(A.get(), !NonVerbose, ArchiveMemberOffsets); - Error Err; - for (auto &C : A->children(Err)) { + for (Archive::child_iterator AI = A->child_begin(), AE = A->child_end(); + AI != AE; ++AI) { + if (std::error_code EC = AI->getError()) + report_error(Filename, EC); + auto &C = AI->get(); Expected> ChildOrErr = C.getAsBinary(); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError())) @@ -1748,8 +1758,6 @@ void llvm::ParseInputMachO(StringRef Filename) { ArchitectureName); } } - if (Err) - report_error(Filename, std::move(Err)); } else { consumeError(AOrErr.takeError()); error("Mach-O universal file: " + Filename + " for architecture " + diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 8414239cb506..bb171ec3fc31 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -1702,8 +1702,10 @@ static void DumpObject(const ObjectFile *o, const Archive *a = nullptr) { /// @brief Dump each object file in \a a; static void DumpArchive(const Archive *a) { - Error Err; - for (auto &C : a->children(Err)) { + for (auto &ErrorOrChild : a->children()) { + if (std::error_code EC = ErrorOrChild.getError()) + report_error(a->getFileName(), EC); + const Archive::Child &C = *ErrorOrChild; Expected> ChildOrErr = C.getAsBinary(); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError())) @@ -1715,8 +1717,6 @@ static void DumpArchive(const Archive *a) { else report_error(a->getFileName(), object_error::invalid_file_type); } - if (Err) - report_error(a->getFileName(), std::move(Err)); } /// @brief Open file and figure out how to dump it. diff --git a/llvm/tools/llvm-readobj/llvm-readobj.cpp b/llvm/tools/llvm-readobj/llvm-readobj.cpp index c293919fd952..ad97dea2d021 100644 --- a/llvm/tools/llvm-readobj/llvm-readobj.cpp +++ b/llvm/tools/llvm-readobj/llvm-readobj.cpp @@ -295,17 +295,6 @@ static void reportError(StringRef Input, StringRef Message) { reportError(Twine(Input) + ": " + Message); } -static void reportError(StringRef Input, Error Err) { - if (Input == "-") - Input = ""; - std::string ErrMsg; - { - raw_string_ostream ErrStream(ErrMsg); - logAllUnhandledErrors(std::move(Err), ErrStream, Input + ": "); - } - reportError(ErrMsg); -} - static bool isMipsArch(unsigned Arch) { switch (Arch) { case llvm::Triple::mips: @@ -435,8 +424,10 @@ static void dumpObject(const ObjectFile *Obj) { /// @brief Dumps each object file in \a Arc; static void dumpArchive(const Archive *Arc) { - Error Err; - for (auto &Child : Arc->children(Err)) { + for (auto &ErrorOrChild : Arc->children()) { + if (std::error_code EC = ErrorOrChild.getError()) + reportError(Arc->getFileName(), EC.message()); + const auto &Child = *ErrorOrChild; Expected> ChildOrErr = Child.getAsBinary(); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError())) { @@ -453,8 +444,6 @@ static void dumpArchive(const Archive *Arc) { else reportError(Arc->getFileName(), readobj_error::unrecognized_file_format); } - if (Err) - reportError(Arc->getFileName(), std::move(Err)); } /// @brief Dumps each object file in \a MachO Universal Binary; diff --git a/llvm/tools/llvm-size/llvm-size.cpp b/llvm/tools/llvm-size/llvm-size.cpp index c5966ead4b6c..ecc0a0eac3ca 100644 --- a/llvm/tools/llvm-size/llvm-size.cpp +++ b/llvm/tools/llvm-size/llvm-size.cpp @@ -527,12 +527,15 @@ static void printFileSectionSizes(StringRef file) { if (Archive *a = dyn_cast(&Bin)) { // This is an archive. Iterate over each member and display its sizes. - Error Err; - for (auto &C : a->children(Err)) { - Expected> ChildOrErr = C.getAsBinary(); + for (object::Archive::child_iterator i = a->child_begin(), + e = a->child_end(); + i != e; ++i) { + if (error(i->getError())) + exit(1); + Expected> ChildOrErr = i->get().getAsBinary(); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError())) - error(std::move(E), a->getFileName(), C); + error(std::move(E), a->getFileName(), i->get()); continue; } if (ObjectFile *o = dyn_cast(&*ChildOrErr.get())) { @@ -552,8 +555,6 @@ static void printFileSectionSizes(StringRef file) { } } } - if (Err) - error(std::move(Err), a->getFileName()); } else if (MachOUniversalBinary *UB = dyn_cast(&Bin)) { // If we have a list of architecture flags specified dump only those. @@ -596,13 +597,17 @@ static void printFileSectionSizes(StringRef file) { std::unique_ptr &UA = *AOrErr; // This is an archive. Iterate over each member and display its // sizes. - Error Err; - for (auto &C : UA->children(Err)) { - Expected> ChildOrErr = C.getAsBinary(); + for (object::Archive::child_iterator i = UA->child_begin(), + e = UA->child_end(); + i != e; ++i) { + if (error(i->getError())) + exit(1); + Expected> ChildOrErr = + i->get().getAsBinary(); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType( ChildOrErr.takeError())) - error(std::move(E), UA->getFileName(), C, + error(std::move(E), UA->getFileName(), i->get(), ArchFlags.size() > 1 ? StringRef(I->getArchTypeName()) : StringRef()); continue; @@ -632,8 +637,6 @@ static void printFileSectionSizes(StringRef file) { } } } - if (Err) - error(std::move(Err), UA->getFileName()); } else { consumeError(AOrErr.takeError()); error("Mach-O universal file: " + file + " for architecture " + @@ -685,13 +688,17 @@ static void printFileSectionSizes(StringRef file) { std::unique_ptr &UA = *AOrErr; // This is an archive. Iterate over each member and display its // sizes. - Error Err; - for (auto &C : UA->children(Err)) { - Expected> ChildOrErr = C.getAsBinary(); + for (object::Archive::child_iterator i = UA->child_begin(), + e = UA->child_end(); + i != e; ++i) { + if (error(i->getError())) + exit(1); + Expected> ChildOrErr = + i->get().getAsBinary(); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType( ChildOrErr.takeError())) - error(std::move(E), UA->getFileName(), C); + error(std::move(E), UA->getFileName(), i->get()); continue; } if (ObjectFile *o = dyn_cast(&*ChildOrErr.get())) { @@ -714,8 +721,6 @@ static void printFileSectionSizes(StringRef file) { } } } - if (Err) - error(std::move(Err), UA->getFileName()); } else { consumeError(AOrErr.takeError()); error("Mach-O universal file: " + file + " for architecture " + @@ -760,13 +765,16 @@ static void printFileSectionSizes(StringRef file) { I->getAsArchive()) { std::unique_ptr &UA = *AOrErr; // This is an archive. Iterate over each member and display its sizes. - Error Err; - for (auto &C : UA->children(Err)) { - Expected> ChildOrErr = C.getAsBinary(); + for (object::Archive::child_iterator i = UA->child_begin(), + e = UA->child_end(); + i != e; ++i) { + if (error(i->getError())) + exit(1); + Expected> ChildOrErr = i->get().getAsBinary(); if (!ChildOrErr) { if (auto E = isNotObjectErrorInvalidFileType( ChildOrErr.takeError())) - error(std::move(E), UA->getFileName(), C, MoreThanOneArch ? + error(std::move(E), UA->getFileName(), i->get(), MoreThanOneArch ? StringRef(I->getArchTypeName()) : StringRef()); continue; } @@ -790,8 +798,6 @@ static void printFileSectionSizes(StringRef file) { } } } - if (Err) - error(std::move(Err), UA->getFileName()); } else { consumeError(AOrErr.takeError()); error("Mach-O universal file: " + file + " for architecture " + diff --git a/llvm/tools/sancov/sancov.cc b/llvm/tools/sancov/sancov.cc index 55b03709dde3..8423d29e751e 100644 --- a/llvm/tools/sancov/sancov.cc +++ b/llvm/tools/sancov/sancov.cc @@ -135,15 +135,10 @@ template static void FailIfError(const ErrorOr &E) { FailIfError(E.getError()); } -static void FailIfError(Error Err) { - if (Err) { - logAllUnhandledErrors(std::move(Err), errs(), "Error: "); - exit(1); - } -} - template static void FailIfError(Expected &E) { - FailIfError(E.takeError()); + if (E) + return; + logAllUnhandledErrors(E.takeError(), errs(), "Error: "); } static void FailIfNotEmpty(const llvm::Twine &E) { @@ -422,8 +417,9 @@ static void getObjectCoveragePoints(const object::ObjectFile &O, static void visitObjectFiles(const object::Archive &A, function_ref Fn) { - Error Err; - for (auto &C : A.children(Err)) { + for (auto &ErrorOrChild : A.children()) { + FailIfError(ErrorOrChild); + const object::Archive::Child &C = *ErrorOrChild; Expected> ChildOrErr = C.getAsBinary(); FailIfError(errorToErrorCode(ChildOrErr.takeError())); if (auto *O = dyn_cast(&*ChildOrErr.get())) @@ -431,7 +427,6 @@ visitObjectFiles(const object::Archive &A, else FailIfError(object::object_error::invalid_file_type); } - FailIfError(std::move(Err)); } static void