[Object] Re-apply r275316 now that I have the corresponding LLD patch ready.
llvm-svn: 275361
diff --git a/llvm/tools/llvm-readobj/llvm-readobj.cpp b/llvm/tools/llvm-readobj/llvm-readobj.cpp
index ad97dea..c293919 100644
--- a/llvm/tools/llvm-readobj/llvm-readobj.cpp
+++ b/llvm/tools/llvm-readobj/llvm-readobj.cpp
@@ -295,6 +295,17 @@
reportError(Twine(Input) + ": " + Message);
}
+static void reportError(StringRef Input, Error Err) {
+ if (Input == "-")
+ Input = "<stdin>";
+ 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:
@@ -424,10 +435,8 @@
/// @brief Dumps each object file in \a Arc;
static void dumpArchive(const Archive *Arc) {
- for (auto &ErrorOrChild : Arc->children()) {
- if (std::error_code EC = ErrorOrChild.getError())
- reportError(Arc->getFileName(), EC.message());
- const auto &Child = *ErrorOrChild;
+ Error Err;
+ for (auto &Child : Arc->children(Err)) {
Expected<std::unique_ptr<Binary>> ChildOrErr = Child.getAsBinary();
if (!ChildOrErr) {
if (auto E = isNotObjectErrorInvalidFileType(ChildOrErr.takeError())) {
@@ -444,6 +453,8 @@
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;