diff options
Diffstat (limited to 'llvm/lib/Transforms/Scalar')
| -rw-r--r-- | llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp | 12 | 
1 files changed, 3 insertions, 9 deletions
| diff --git a/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp b/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp index bc87106b3d2..a3c426a714e 100644 --- a/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp +++ b/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp @@ -66,11 +66,6 @@ static cl::opt<bool> DisableBranchOpts(    "disable-cgp-branch-opts", cl::Hidden, cl::init(false),    cl::desc("Disable branch optimizations in CodeGenPrepare")); -// FIXME: Remove this abomination once all of the tests pass without it! -static cl::opt<bool> DisableDeleteDeadBlocks( -  "disable-cgp-delete-dead-blocks", cl::Hidden, cl::init(false), -  cl::desc("Disable deleting dead blocks in CodeGenPrepare")); -  static cl::opt<bool> DisableSelectToBranch(    "disable-cgp-select2branch", cl::Hidden, cl::init(false),    cl::desc("Disable select to branch conversion.")); @@ -188,10 +183,9 @@ bool CodeGenPrepare::runOnFunction(Function &F) {            WorkList.insert(*II);      } -    if (!DisableDeleteDeadBlocks) -      for (SmallPtrSet<BasicBlock*, 8>::iterator -             I = WorkList.begin(), E = WorkList.end(); I != E; ++I) -        DeleteDeadBlock(*I); +    for (SmallPtrSet<BasicBlock*, 8>::iterator +           I = WorkList.begin(), E = WorkList.end(); I != E; ++I) +      DeleteDeadBlock(*I);      // Merge pairs of basic blocks with unconditional branches, connected by      // a single edge. | 

