commit 1d32d8b176dc3c89b26c8322120cfeeb0f31ff2d
author Jordan Rupprecht <rupprecht@google.com> Mon Oct 14 17:29:15 2019 +0000
committer Jordan Rupprecht <rupprecht@google.com> Mon Oct 14 17:29:15 2019 +0000
tree 2affeca20e819cfa21d24e0174b9a48d52dcbd09
parent eef612bf91b640f3cd57be003b0dcd5c22f84202

Reapply: [llvm-size] Tidy up error messages (PR42970)

Clean up some formatting inconsistencies in the error messages and correctly exit with non-zero in all error cases.

Originally submitted as r374771 and then reverted as r374780, this patch fixes the libObject test case in Object/macho-invalid.test.

Patch by Alex Cameron

Differential Revision: https://reviews.llvm.org/D68906

llvm-svn: 374793

llvm/tools/llvm-size/llvm-size.cpp

diff --git a/llvm/tools/llvm-size/llvm-size.cpp b/llvm/tools/llvm-size/llvm-size.cpp
index da56199..7c63bc2 100644
--- a/llvm/tools/llvm-size/llvm-size.cpp
+++ b/llvm/tools/llvm-size/llvm-size.cpp
@@ -24,6 +24,7 @@
 #include "llvm/Support/Format.h"
 #include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/WithColor.h"
 #include "llvm/Support/raw_ostream.h"
 #include <algorithm>
 #include <string>
@@ -106,11 +107,9 @@
 
 static std::string ToolName;
 
-static bool error(Twine Message) {
+static void error(const Twine &Message, StringRef File) {
   HadError = true;
-  errs() << ToolName << ": " << Message << ".\n";
-  errs().flush();
-  return true;
+  WithColor::error(errs(), ToolName) << "'" << File << "': " << Message << "\n";
 }
 
 // This version of error() prints the archive name and member name, for example:
@@ -119,7 +118,7 @@
 static void error(llvm::Error E, StringRef FileName, const Archive::Child &C,
                   StringRef ArchitectureName = StringRef()) {
   HadError = true;
-  errs() << ToolName << ": " << FileName;
+  WithColor::error(errs(), ToolName) << "'" << FileName << "'";
 
   Expected<StringRef> NameOrErr = C.getName();
   // TODO: if we have a error getting the name then it would be nice to print
@@ -138,7 +137,7 @@
   raw_string_ostream OS(Buf);
   logAllUnhandledErrors(std::move(E), OS);
   OS.flush();
-  errs() << " " << Buf << "\n";
+  errs() << ": " << Buf << "\n";
 }
 
 // This version of error() prints the file name and which architecture slice it // is from, for example: "foo.o (for architecture i386)" after the ToolName
@@ -147,7 +146,7 @@
 static void error(llvm::Error E, StringRef FileName,
                   StringRef ArchitectureName = StringRef()) {
   HadError = true;
-  errs() << ToolName << ": " << FileName;
+  WithColor::error(errs(), ToolName) << "'" << FileName << "'";
 
   if (!ArchitectureName.empty())
     errs() << " (for architecture " << ArchitectureName << ") ";
@@ -156,7 +155,7 @@
   raw_string_ostream OS(Buf);
   logAllUnhandledErrors(std::move(E), OS);
   OS.flush();
-  errs() << " " << Buf << "\n";
+  errs() << ": " << Buf << "\n";
 }
 
 /// Get the length of the string that represents @p num in Radix including the
@@ -529,7 +528,7 @@
   if (none_of(ArchFlags, [&](const std::string &Name) {
         return Name == T.getArchName();
       })) {
-    error(Filename + ": No architecture specified");
+    error("no architecture specified", Filename);
     return false;
   }
   return true;
@@ -658,15 +657,15 @@
                 error(std::move(Err), UA->getFileName());
             } else {
               consumeError(AOrErr.takeError());
-              error("Mach-O universal file: " + file + " for architecture " +
-                    StringRef(I->getArchFlagName()) +
-                    " is not a Mach-O file or an archive file");
+              error("mach-o universal file for architecture " +
+                        StringRef(I->getArchFlagName()) +
+                        " is not a mach-o file or an archive file",
+                    file);
             }
           }
         }
         if (!ArchFound) {
-          errs() << ToolName << ": file: " << file
-                 << " does not contain architecture" << ArchFlags[i] << ".\n";
+          error("file does not contain architecture " + ArchFlags[i], file);
           return;
         }
       }
@@ -740,9 +739,10 @@
               error(std::move(Err), UA->getFileName());
           } else {
             consumeError(AOrErr.takeError());
-            error("Mach-O universal file: " + file + " for architecture " +
-                   StringRef(I->getArchFlagName()) +
-                   " is not a Mach-O file or an archive file");
+            error("mach-o universal file for architecture " +
+                      StringRef(I->getArchFlagName()) +
+                      " is not a mach-o file or an archive file",
+                  file);
           }
           return;
         }
@@ -816,9 +816,10 @@
           error(std::move(Err), UA->getFileName());
       } else {
         consumeError(AOrErr.takeError());
-        error("Mach-O universal file: " + file + " for architecture " +
-               StringRef(I->getArchFlagName()) +
-               " is not a Mach-O file or an archive file");
+        error("mach-o universal file for architecture " +
+                  StringRef(I->getArchFlagName()) +
+                  " is not a mach-o file or an archive file",
+              file);
       }
     }
   } else if (ObjectFile *o = dyn_cast<ObjectFile>(&Bin)) {
@@ -836,8 +837,7 @@
       outs() << "\n";
     }
   } else {
-    errs() << ToolName << ": " << file << ": "
-           << "Unrecognized file type.\n";
+    error("unsupported file type", file);
   }
   // System V adds an extra newline at the end of each file.
   if (OutputFormat == sysv)