[llvm] r374771 - [llvm-size] Tidy up error messages (PR42970)
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 14 05:51:47 PDT 2019
Author: maskray
Date: Mon Oct 14 05:51:47 2019
New Revision: 374771
URL: http://llvm.org/viewvc/llvm-project?rev=374771&view=rev
Log:
[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.
Differential Revision: https://reviews.llvm.org/D68906
Patch by Alex Cameron
Modified:
llvm/trunk/test/tools/llvm-size/invalid-input.test
llvm/trunk/test/tools/llvm-size/no-input.test
llvm/trunk/tools/llvm-size/llvm-size.cpp
Modified: llvm/trunk/test/tools/llvm-size/invalid-input.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-size/invalid-input.test?rev=374771&r1=374770&r2=374771&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-size/invalid-input.test (original)
+++ llvm/trunk/test/tools/llvm-size/invalid-input.test Mon Oct 14 05:51:47 2019
@@ -1,19 +1,15 @@
## Show that llvm-size reports an error when passed an input file in an
## unknown format.
-## FIXME: The error messages tested here are not consistently formatted, and the
-## second one doesn't even return with a non-zero exit code.
-## See https://bugs.llvm.org/show_bug.cgi?id=42970.
-
# RUN: not llvm-size %s 2>&1 | FileCheck %s -DFILE=%s --check-prefix=UNRECOGNIZED
-# UNRECOGNIZED: {{.*}}llvm-size{{(.*)}}: [[FILE]] The file was not recognized as a valid object file
+# UNRECOGNIZED: {{.*}}llvm-size{{(.*)}}: error: '[[FILE]]': The file was not recognized as a valid object file
## Show that llvm-size reports an error when passed an input file in an
## unsupported format.
# RUN: yaml2obj %s -o %t
-# RUN: llvm-size %t 2>&1 | FileCheck %s -DFILE=%t --check-prefix=NOTSUPPORTED
-# NOTSUPPORTED: {{.*}}llvm-size{{(.*)}}: [[FILE]]: Unrecognized file type.
+# RUN: not llvm-size %t 2>&1 | FileCheck %s -DFILE=%t --check-prefix=NOTSUPPORTED
+# NOTSUPPORTED: {{.*}}llvm-size{{(.*)}}: error: '[[FILE]]': unsupported file type
--- !minidump
Streams:
Modified: llvm/trunk/test/tools/llvm-size/no-input.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-size/no-input.test?rev=374771&r1=374770&r2=374771&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-size/no-input.test (original)
+++ llvm/trunk/test/tools/llvm-size/no-input.test Mon Oct 14 05:51:47 2019
@@ -1,7 +1,7 @@
## Show that llvm-size emits an error if passed in a non-existent file.
# RUN: not llvm-size %t.blah 2>&1 | FileCheck %s -DFILE=%t.blah --check-prefix=ENOENT
-# ENOENT: {{.*}}llvm-size{{.*}}: [[FILE]] {{[Nn]}}o such file or directory
+# ENOENT: {{.*}}llvm-size{{.*}}: error: '[[FILE]]': {{[Nn]}}o such file or directory
## Show that llvm-size reads a.out if not passed any file.
Modified: llvm/trunk/tools/llvm-size/llvm-size.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-size/llvm-size.cpp?rev=374771&r1=374770&r2=374771&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-size/llvm-size.cpp (original)
+++ llvm/trunk/tools/llvm-size/llvm-size.cpp Mon Oct 14 05:51:47 2019
@@ -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 bool HadError = false;
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 bool error(Twine Message) {
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 @@ static void error(llvm::Error E, StringR
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, StringR
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 @@ static void error(llvm::Error E, StringR
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 @@ static bool checkMachOAndArchFlags(Objec
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 @@ static void printFileSectionSizes(String
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 @@ static void printFileSectionSizes(String
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 @@ static void printFileSectionSizes(String
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 @@ static void printFileSectionSizes(String
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)
More information about the llvm-commits
mailing list