RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

tools: Unify how verifyModule() is called

Browse Source 
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!

llvm-svn: 233667
This commit is contained in:
Duncan P. N. Exon Smith 2015-03-31 03:07:23 +00:00
parent 89e1216297
commit cd3df9500c
6 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Linker/broken.ll
View File

@ -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

2
tools/bugpoint/BugDriver.cpp
View File

@ -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>();
}

2
tools/llc/llc.cpp
View File

@ -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;
}

10
tools/llvm-link/llvm-link.cpp
View File

@ -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;
}

3
tools/opt/opt.cpp
View File

@ -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;
}

7
tools/verify-uselistorder/verify-uselistorder.cpp
View File

@ -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.