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

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

diff --git a/include/llvm/Target/TargetOptions.h b/include/llvm/Target/TargetOptions.h
index 6c3d88a43cd0f42c4fdfb63ed7ebeced57fb91af..fa739507db0f05ecbc3e80ba756dc504e5409086 100644 (file)
--- a/include/llvm/Target/TargetOptions.h
+++ b/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/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 6299bc4b851f7270dc982993b8f561ab926a438a..b3e18f60dad9c1102f226cc1dfcc719e378fcffb 100644 (file)
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/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/lib/Target/TargetMachine.cpp b/lib/Target/TargetMachine.cpp
index 29167631baab5769bee412f8aeba67dc39fc2fb0..600a120e867c559d70e7eb1ac597ad9de4ade752 100644 (file)
--- a/lib/Target/TargetMachine.cpp
+++ b/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
 //