6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-22 09:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Change the verifier to never throw an exception. Instead verifyModule canoptionally return the string error, which is an easier api for clients touse anyway.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29017 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2006-07-06 18:02:27 +00:00
parent 1d662a6afc
commit 05ac92ca7d
5 changed files with 41 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/Bytecode/Reader/Analyzer.cpp
View File

@ -117,12 +117,10 @@ public:
bca.functionDensity = double(bca.BlockSizes[BytecodeFormat::FunctionBlockID]) /
double(bca.numFunctions);
if ( bca.progressiveVerify ) {
try {
verifyModule(*M, ThrowExceptionAction);
} catch ( std::string& msg ) {
if (bca.progressiveVerify) {
std::string msg;
if (verifyModule(*M, ReturnStatusAction, &msg))
bca.VerifyInfo += "Verify@Finish: " + msg + "\n";
}
}
}
@ -135,12 +133,10 @@ public:
virtual void handleModuleEnd(const std::string& id) {
if (os)
*os << " } End Module " << id << "\n";
if ( bca.progressiveVerify ) {
try {
verifyModule(*M, ThrowExceptionAction);
} catch ( std::string& msg ) {
if (bca.progressiveVerify) {
std::string msg;
if (verifyModule(*M, ReturnStatusAction, &msg))
bca.VerifyInfo += "Verify@EndModule: " + msg + "\n";
}
}
}
@ -232,12 +228,10 @@ public:
virtual void handleModuleGlobalsEnd() {
if (os)
*os << " } END BLOCK: ModuleGlobalInfo\n";
if ( bca.progressiveVerify ) {
try {
verifyModule(*M, ThrowExceptionAction);
} catch ( std::string& msg ) {
if (bca.progressiveVerify) {
std::string msg;
if (verifyModule(*M, ReturnStatusAction, &msg))
bca.VerifyInfo += "Verify@EndModuleGlobalInfo: " + msg + "\n";
}
}
}
@ -346,12 +340,10 @@ public:
currFunc->density = double(currFunc->byteSize) /
double(currFunc->numInstructions);
if ( bca.progressiveVerify ) {
try {
verifyModule(*M, ThrowExceptionAction);
} catch ( std::string& msg ) {
if (bca.progressiveVerify) {
std::string msg;
if (verifyModule(*M, ReturnStatusAction, &msg))
bca.VerifyInfo += "Verify@EndFunction: " + msg + "\n";
}
}
}
@ -522,12 +514,10 @@ public:
if (os)
*os << " } END BLOCK: GlobalConstants\n";
if ( bca.progressiveVerify ) {
try {
verifyModule(*M, ThrowExceptionAction);
} catch ( std::string& msg ) {
if (bca.progressiveVerify) {
std::string msg;
if (verifyModule(*M, ReturnStatusAction, &msg))
bca.VerifyInfo += "Verify@EndGlobalConstants: " + msg + "\n";
}
}
}

15
lib/VMCore/Verifier.cpp
View File

@ -152,18 +152,13 @@ namespace { // Anonymous namespace for class
/// this condition, do so.
///
void abortIfBroken() {
if (Broken)
{
if (Broken) {
msgs << "Broken module found, ";
switch (action)
{
switch (action) {
case AbortProcessAction:
msgs << "compilation aborted!\n";
std::cerr << msgs.str();
abort();
case ThrowExceptionAction:
msgs << "verification terminated.\n";
throw msgs.str();
case PrintMessageAction:
msgs << "verification continues.\n";
std::cerr << msgs.str();
@ -799,11 +794,15 @@ bool llvm::verifyFunction(const Function &f, VerifierFailureAction action) {
/// verifyModule - Check a module for errors, printing messages on stderr.
/// Return true if the module is corrupt.
///
bool llvm::verifyModule(const Module &M, VerifierFailureAction action) {
bool llvm::verifyModule(const Module &M, VerifierFailureAction action,
std::string *ErrorInfo) {
PassManager PM;
Verifier *V = new Verifier(action);
PM.add(V);
PM.run((Module&)M);
if (ErrorInfo && V->Broken)
*ErrorInfo = V->msgs.str();
return V->Broken;
}

16
tools/llvm-as/llvm-as.cpp
View File

@ -63,14 +63,14 @@ int main(int argc, char **argv) {
return 1;
}
try {
if (!DisableVerify)
verifyModule(*M.get(), ThrowExceptionAction);
} catch (const std::string &Err) {
std::cerr << argv[0]
<< ": assembly parsed, but does not verify as correct!\n";
std::cerr << Err;
return 1;
if (!DisableVerify) {
std::string Err;
if (verifyModule(*M.get(), ReturnStatusAction, &Err)) {
std::cerr << argv[0]
<< ": assembly parsed, but does not verify as correct!\n";
std::cerr << Err;
return 1;
}
}
if (DumpAsm) std::cerr << "Here's the assembly:\n" << *M.get();

15
tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
View File

@ -73,23 +73,10 @@ main(int argc, char **argv) {
if ( M && Verify ) {
std::string verificationMsg;
try {
verifyModule( *M, ThrowExceptionAction );
} catch (std::string& errmsg ) {
verificationMsg = errmsg;
}
if ( verificationMsg.length() > 0 )
if (verifyModule(*M, ReturnStatusAction, &verificationMsg))
std::cerr << "Final Verification Message: " << verificationMsg << "\n";
}
// If there was an error, print it and stop.
if ( ErrorMessage.size() ) {
std::cerr << argv[0] << ": " << ErrorMessage << "\n";
return 1;
}
if (Out != &std::cout) {
((std::ofstream*)Out)->close();
delete Out;

18
tools/llvm2cpp/llvm2cpp.cpp
View File

@ -59,14 +59,16 @@ int main(int argc, char **argv) {
return 1;
}
try {
if (!DisableVerify)
verifyModule(*M.get(), ThrowExceptionAction);
} catch (const std::string &Err) {
std::cerr << argv[0]
<< ": assembly parsed, but does not verify as correct!\n";
std::cerr << Err;
return 1;
// FIXME: llvm2cpp should read .bc files and thus not run the verifier
// explicitly!
if (!DisableVerify) {
std::string Err;
if (verifyModule(*M.get(), ReturnStatusAction, &Err)) {
std::cerr << argv[0]
<< ": assembly parsed, but does not verify as correct!\n";
std::cerr << Err;
return 1;
}
}
if (OutputFilename != "") { // Specified an output filename?