[PATCH] D66425: [llvm-readobj] Prepend argv[0] to error messages
Fangrui Song via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Aug 20 05:50:20 PDT 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rL369377: [llvm-readobj] Prepend argv[0] to error/warning messages (authored by MaskRay, committed by ).
Herald added subscribers: s.egerton, simoncook.
Changed prior to commit:
https://reviews.llvm.org/D66425?vs=216110&id=216113#toc
Repository:
rL LLVM
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D66425/new/
https://reviews.llvm.org/D66425
Files:
llvm/trunk/test/tools/llvm-readobj/error-format.test
llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp
Index: llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp
===================================================================
--- llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp
+++ llvm/trunk/tools/llvm-readobj/llvm-readobj.cpp
@@ -373,6 +373,8 @@
HelpResponse("\nPass @FILE as argument to read options from FILE.\n");
} // namespace opts
+static StringRef ToolName;
+
namespace llvm {
LLVM_ATTRIBUTE_NORETURN static void error(Twine Msg) {
@@ -380,7 +382,7 @@
// proper place.
fouts().flush();
errs() << "\n";
- WithColor::error(errs()) << Msg << "\n";
+ WithColor::error(errs(), ToolName) << Msg << "\n";
exit(1);
}
@@ -401,11 +403,11 @@
// Flush the standard output to print the warning at a
// proper place.
fouts().flush();
- handleAllErrors(createFileError(Input, std::move(Err)),
- [&](const ErrorInfoBase &EI) {
- errs() << "\n";
- WithColor::warning(errs()) << EI.message() << "\n";
- });
+ handleAllErrors(
+ createFileError(Input, std::move(Err)), [&](const ErrorInfoBase &EI) {
+ errs() << "\n";
+ WithColor::warning(errs(), ToolName) << EI.message() << "\n";
+ });
}
LLVM_ATTRIBUTE_NORETURN void reportError(std::error_code EC, StringRef Input) {
@@ -703,6 +705,7 @@
int main(int argc, const char *argv[]) {
InitLLVM X(argc, argv);
+ ToolName = argv[0];
// Register the target printer for --version.
cl::AddExtraVersionPrinter(TargetRegistry::printRegisteredTargetsForVersion);
Index: llvm/trunk/test/tools/llvm-readobj/error-format.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/error-format.test
+++ llvm/trunk/test/tools/llvm-readobj/error-format.test
@@ -0,0 +1,19 @@
+## This test shows that we include the tool name in error/warning messages.
+
+# RUN: not llvm-readelf %S/non-existent 2>&1 | FileCheck --check-prefix=ERR %s -DTOOL=readelf
+# RUN: not llvm-readobj %S/non-existent 2>&1 | FileCheck --check-prefix=ERR %s -DTOOL=readobj
+
+# ERR: llvm-[[TOOL]]{{(\.exe)?}}: error: '{{.*}}': {{[Nn]}}o such file or directory
+
+# RUN: yaml2obj %s -o %t
+# RUN: llvm-readelf -x 10 %t 2>&1 | FileCheck --check-prefix=WARN %s -DTOOL=readelf
+# RUN: llvm-readobj -x 10 %t 2>&1 | FileCheck --check-prefix=WARN %s -DTOOL=readobj
+
+# WARN: llvm-[[TOOL]]{{(\.exe)?}}: warning: '{{.*}}': could not find section 10
+
+--- !ELF
+FileHeader:
+ Class: ELFCLASS64
+ Data: ELFDATA2LSB
+ Type: ET_DYN
+ Machine: EM_RISCV
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D66425.216113.patch
Type: text/x-patch
Size: 2552 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190820/58384ea9/attachment.bin>
More information about the llvm-commits
mailing list