Remove the -disable-correct-folding option, which was ugly and is no longer needed.

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

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index b3e18f60dad9c1102f226cc1dfcc719e378fcffb..961c12d7a7718398b46b425f6c31ef0cb1ddeada 100644 (file)
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -53,9 +53,6 @@ static cl::opt<bool>
 EnableValueProp("enable-value-prop", cl::Hidden);
 static cl::opt<bool>
 EnableLegalizeTypes("enable-legalize-types", cl::Hidden);
-static cl::opt<bool>
-DisableCorrectBranchFolding("disable-correct-folding", cl::init(false), 
-                            cl::Hidden);
 
 
 #ifndef NDEBUG
@@ -1638,14 +1635,12 @@ void SelectionDAGLowering::visitSwitchCase(SelectionDAGISel::CaseBlock &CB) {
   
   // If the branch was constant folded, fix up the CFG.
   if (BrCond.getOpcode() == ISD::BR) {
-    if (!DisableCorrectBranchFolding)
-      CurMBB->removeSuccessor(CB.FalseBB);
+    CurMBB->removeSuccessor(CB.FalseBB);
     DAG.setRoot(BrCond);
   } else {
     // Otherwise, go ahead and insert the false branch.
     if (BrCond == getControlRoot()) 
-      if (!DisableCorrectBranchFolding)
-        CurMBB->removeSuccessor(CB.TrueBB);
+      CurMBB->removeSuccessor(CB.TrueBB);
     
     if (CB.FalseBB == NextBlock)
       DAG.setRoot(BrCond);