/// If the passes did not compile correctly, output the command required to
/// recreate the failure. This returns true if a compiler error is found.
///
-bool BugDriver::runManyPasses(const std::vector<const PassInfo*> &AllPasses) {
+bool BugDriver::runManyPasses(const std::vector<std::string> &AllPasses,
+ std::string &ErrMsg) {
setPassesToRun(AllPasses);
outs() << "Starting bug finding procedure...\n\n";
//
outs() << "Running selected passes on program to test for crash: ";
for(int i = 0, e = PassesToRun.size(); i != e; i++) {
- outs() << "-" << PassesToRun[i]->getPassArgument( )<< " ";
+ outs() << "-" << PassesToRun[i] << " ";
}
std::string Filename;
- if(runPasses(PassesToRun, Filename, false)) {
+ if(runPasses(Program, PassesToRun, Filename, false)) {
outs() << "\n";
outs() << "Optimizer passes caused failure!\n\n";
debugOptimizerCrash();
// Step 3: Compile the optimized code.
//
outs() << "Running the code generator to test for a crash: ";
- try {
- compileProgram(Program);
- outs() << '\n';
- } catch (ToolExecutionError &TEE) {
+ std::string Error;
+ compileProgram(Program, &Error);
+ if (!Error.empty()) {
outs() << "\n*** compileProgram threw an exception: ";
- outs() << TEE.what();
- return debugCodeGeneratorCrash();
+ outs() << Error;
+ return debugCodeGeneratorCrash(ErrMsg);
}
+ outs() << '\n';
//
// Step 4: Run the program and compare its output to the reference
// output (created above).
//
outs() << "*** Checking if passes caused miscompliation:\n";
- try {
- if (diffProgram(Filename, "", false)) {
- outs() << "\n*** diffProgram returned true!\n";
- debugMiscompilation();
+ bool Diff = diffProgram(Program, Filename, "", false, &Error);
+ if (Error.empty() && Diff) {
+ outs() << "\n*** diffProgram returned true!\n";
+ debugMiscompilation(&Error);
+ if (Error.empty())
return true;
- } else {
- outs() << "\n*** diff'd output matches!\n";
- }
- } catch (ToolExecutionError &TEE) {
- errs() << TEE.what();
- debugCodeGeneratorCrash();
+ }
+ if (!Error.empty()) {
+ errs() << Error;
+ debugCodeGeneratorCrash(ErrMsg);
return true;
}
+ outs() << "\n*** diff'd output matches!\n";
sys::Path(Filename).eraseFromDisk();