From 1d1ef14248a24cb7239e0bc9298d84004a8044e6 Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Thu, 14 Feb 2008 05:01:46 +0000 Subject: [PATCH] PR2027, Fix bugpoint's -find-bugs option, clean up the code. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47105 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/bugpoint/FindBugs.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tools/bugpoint/FindBugs.cpp b/tools/bugpoint/FindBugs.cpp index 04f94268a91..e42cce47ba0 100644 --- a/tools/bugpoint/FindBugs.cpp +++ b/tools/bugpoint/FindBugs.cpp @@ -30,8 +30,7 @@ using namespace llvm; /// recreate the failure. This returns true if a compiler error is found. /// bool BugDriver::runManyPasses(const std::vector &AllPasses) { - std::string Filename; - std::vector TempPass(AllPasses); + setPassesToRun(AllPasses); std::cout << "Starting bug finding procedure...\n\n"; // Creating a reference output if necessary @@ -45,26 +44,24 @@ bool BugDriver::runManyPasses(const std::vector &AllPasses) { } srand(time(NULL)); - std::vector::iterator I = TempPass.begin(); - std::vector::iterator E = TempPass.end(); - + unsigned num = 1; while(1) { // // Step 1: Randomize the order of the optimizer passes. // - std::random_shuffle(TempPass.begin(), TempPass.end()); + std::random_shuffle(PassesToRun.begin(), PassesToRun.end()); // // Step 2: Run optimizer passes on the program and check for success. // std::cout << "Running selected passes on program to test for crash: "; - for(int i = 0, e = TempPass.size(); i != e; i++) { - std::cout << "-" << TempPass[i]->getPassArgument( )<< " "; + for(int i = 0, e = PassesToRun.size(); i != e; i++) { + std::cout << "-" << PassesToRun[i]->getPassArgument( )<< " "; } std::string Filename; - if(runPasses(TempPass, Filename, false)) { + if(runPasses(PassesToRun, Filename, false)) { std::cout << "\n"; std::cout << "Optimizer passes caused failure!\n\n"; debugOptimizerCrash(); @@ -72,7 +69,7 @@ bool BugDriver::runManyPasses(const std::vector &AllPasses) { } else { std::cout << "Combination " << num << " optimized successfully!\n"; } - + // // Step 3: Compile the optimized code. // @@ -85,7 +82,7 @@ bool BugDriver::runManyPasses(const std::vector &AllPasses) { std::cout << TEE.what(); return debugCodeGeneratorCrash(); } - + // // Step 4: Run the program and compare its output to the reference // output (created above).