From 4e5fdbfc61a1fb4efd5e9eb0e208e1bde91f9853 Mon Sep 17 00:00:00 2001
From: "Duncan P. N. Exon Smith" <dexonsmith@apple.com>
Date: Tue, 31 Mar 2015 03:07:23 +0000
Subject: [PATCH] tools: Unify how verifyModule() is called
Unify the error messages for the various tools when `verifyModule()`
fails on an input module. The "brave new way" is:
lltool: path/to/input.ll: error: input module is broken!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@233667 91177308-0d34-0410-b5e6-96231b3b80d8
---
test/Linker/broken.ll | 2 +-
tools/bugpoint/BugDriver.cpp | 2 +-
tools/llc/llc.cpp | 2 +-
tools/llvm-link/llvm-link.cpp | 10 +++++-----
tools/opt/opt.cpp | 3 ++-
tools/verify-uselistorder/verify-uselistorder.cpp | 7 +++++--
6 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/test/Linker/broken.ll b/test/Linker/broken.ll
index 22764017442..8aefe4e6a37 100644
--- a/test/Linker/broken.ll
+++ b/test/Linker/broken.ll
@@ -1,6 +1,6 @@
; RUN: not llvm-link -o /dev/null %s 2>&1 | FileCheck %s
-; CHECK: input module '{{.*}}broken.ll' is broken
+; CHECK: broken.ll: error: input module is broken!
define i32 @foo(i32 %v) {
%first = add i32 %v, %second
%second = add i32 %v, 3
diff --git a/tools/bugpoint/BugDriver.cpp b/tools/bugpoint/BugDriver.cpp
index 865cb513c55..43f4c2963fc 100644
--- a/tools/bugpoint/BugDriver.cpp
+++ b/tools/bugpoint/BugDriver.cpp
@@ -93,7 +93,7 @@ std::unique_ptr<Module> llvm::parseInputFile(StringRef Filename,
}
if (verifyModule(*Result, &errs())) {
- errs() << "bugpoint: " << Filename << ": error: does not verify\n";
+ errs() << "bugpoint: " << Filename << ": error: input module is broken!\n";
return std::unique_ptr<Module>();
}
diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
index fa8d2688dd2..000948c10a0 100644
--- a/tools/llc/llc.cpp
+++ b/tools/llc/llc.cpp
@@ -230,7 +230,7 @@ static int compileModule(char **argv, LLVMContext &Context) {
// called on any passes.
if (!NoVerify && verifyModule(*M, &errs())) {
errs() << argv[0] << ": " << InputFilename
- << ": error: does not verify\n";
+ << ": error: input module is broken!\n";
return 1;
}
diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp
index 29c4c736b33..6924aa5cb2e 100644
--- a/tools/llvm-link/llvm-link.cpp
+++ b/tools/llvm-link/llvm-link.cpp
@@ -116,9 +116,9 @@ int main(int argc, char **argv) {
return 1;
}
- if (verifyModule(*M)) {
- errs() << argv[0] << ": input module '" << InputFilenames[i]
- << "' is broken!\n";
+ if (verifyModule(*M, &errs())) {
+ errs() << argv[0] << ": " << InputFilenames[i]
+ << ": error: input module is broken!\n";
return 1;
}
@@ -137,8 +137,8 @@ int main(int argc, char **argv) {
return 1;
}
- if (verifyModule(*Composite)) {
- errs() << argv[0] << ": linked module is broken!\n";
+ if (verifyModule(*Composite, &errs())) {
+ errs() << argv[0] << ": error: linked module is broken!\n";
return 1;
}
diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp
index 86fbed70036..c64e907af22 100644
--- a/tools/opt/opt.cpp
+++ b/tools/opt/opt.cpp
@@ -354,7 +354,8 @@ int main(int argc, char **argv) {
// pass pipelines. Otherwise we can crash on broken code during
// doInitialization().
if (!NoVerify && verifyModule(*M, &errs())) {
- errs() << argv[0] << ": " << InputFilename << ": error: does not verify\n";
+ errs() << argv[0] << ": " << InputFilename
+ << ": error: input module is broken!\n";
return 1;
}
diff --git a/tools/verify-uselistorder/verify-uselistorder.cpp b/tools/verify-uselistorder/verify-uselistorder.cpp
index ef3d5b39253..09931587470 100644
--- a/tools/verify-uselistorder/verify-uselistorder.cpp
+++ b/tools/verify-uselistorder/verify-uselistorder.cpp
@@ -534,8 +534,11 @@ int main(int argc, char **argv) {
Err.print(argv[0], errs());
return 1;
}
- if (verifyModule(*M, &errs()))
- report_fatal_error("verification failed");
+ if (verifyModule(*M, &errs())) {
+ errs() << argv[0] << ": " << InputFilename
+ << ": error: input module is broken!\n";
+ return 1;
+ }
errs() << "*** verify-use-list-order ***\n";
// Can't verify if order isn't preserved.
--
2.40.0