This option doesn't need to be a target option. It can be in SDISel instead.

llvm-svn: 54336

3 files changed, 3 insertions, 11 deletions

diff --git a/llvm/include/llvm/Target/TargetOptions.h b/llvm/include/llvm/Target/TargetOptions.h
index 6c3d88a43cd..fa739507db0 100644
--- a/llvm/include/llvm/Target/TargetOptions.h
+++ b/llvm/include/llvm/Target/TargetOptions.h
@@ -101,11 +101,6 @@ namespace llvm {
   /// DisableJumpTables - This flag indicates jump tables should not be 
   /// generated.
   extern bool DisableJumpTables;
-  
-  /// DisableCorrectBranchFolding - This flag indicates whether the instruction
-  /// selector should take care to update the CFG properly when
-  /// folding branches.
-  extern bool DisableCorrectBranchFolding;
 } // End llvm namespace
 
 #endif
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 6299bc4b851..b3e18f60dad 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -53,6 +53,9 @@ 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
diff --git a/llvm/lib/Target/TargetMachine.cpp b/llvm/lib/Target/TargetMachine.cpp
index 29167631baa..600a120e867 100644
--- a/llvm/lib/Target/TargetMachine.cpp
+++ b/llvm/lib/Target/TargetMachine.cpp
@@ -40,7 +40,6 @@ namespace llvm {
   bool RealignStack;
   bool VerboseAsm;
   bool DisableJumpTables;
-  bool DisableCorrectBranchFolding;
 }
 
 static cl::opt<bool, true> PrintCode("print-machineinstrs",
@@ -164,11 +163,6 @@ DisableSwitchTables(cl::Hidden, "disable-jump-tables",
            cl::location(DisableJumpTables),
            cl::init(false));
 
-static cl::opt<bool, true>
-DisableCorrectISelFolding(cl::Hidden, "disable-correct-folding",
-cl::desc("Do not perform correct branch folding in the instruction selector."),
-cl::location(DisableCorrectBranchFolding), cl::init(false));
-
 //---------------------------------------------------------------------------
 // TargetMachine Class
 //