Fix the "infinite looping unless you disable adce" bug

Also remove an option to disable adce :)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@12359 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/bugpoint/CrashDebugger.cpp b/tools/bugpoint/CrashDebugger.cpp
index a0b695cc21f84c559e840ebdd9c723340b63f9d0..04f494a0b620aa686be2a677c13494b726a802b2 100644 (file)
--- a/tools/bugpoint/CrashDebugger.cpp
+++ b/tools/bugpoint/CrashDebugger.cpp
@@ -330,7 +330,7 @@ static bool DebugACrash(BugDriver &BD,  bool (*TestFn)(BugDriver &, Module *)) {
 
   // FIXME: This should use the list reducer to converge faster by deleting
   // larger chunks of instructions at a time!
-  unsigned Simplification = 4;
+  unsigned Simplification = 2;
   do {
     --Simplification;
     std::cout << "\n*** Attempting to reduce testcase by deleting instruc"

diff --git a/tools/bugpoint/ExtractFunction.cpp b/tools/bugpoint/ExtractFunction.cpp
index 9841c44c0f21237b95e22c52baed790c6d3e8ebb..b9298d3db35f7b8dae33a07acbac56b007741422 100644 (file)
--- a/tools/bugpoint/ExtractFunction.cpp
+++ b/tools/bugpoint/ExtractFunction.cpp
@@ -33,9 +33,6 @@ namespace llvm {
 
 namespace {
   cl::opt<bool>
-  NoADCE("disable-adce",
-         cl::desc("Do not use the -adce pass to reduce testcases"));
-  cl::opt<bool>
   NoDCE ("disable-dce",
          cl::desc("Do not use the -dce pass to reduce testcases"));
   cl::opt<bool, true>
@@ -78,9 +75,6 @@ Module *BugDriver::deleteInstructionFromProgram(const Instruction *I,
   // Make sure that the appropriate target data is always used...
   Passes.add(new TargetData("bugpoint", Result));
 
-  if (Simplification > 2 && !NoADCE)
-    Passes.add(createAggressiveDCEPass());          // Remove dead code...
-  //Passes.add(createInstructionCombiningPass());
   if (Simplification > 1 && !NoDCE)
     Passes.add(createDeadCodeEliminationPass());
   if (Simplification && !DisableSimplifyCFG)