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 6c3d88a..fa73950 100644
--- a/include/llvm/Target/TargetOptions.h
+++ b/include/llvm/Target/TargetOptions.h
@@ -101,11 +101,6 @@
/// 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 6299bc4..b3e18f6 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -53,6 +53,9 @@
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 2916763..600a120 100644
--- a/lib/Target/TargetMachine.cpp
+++ b/lib/Target/TargetMachine.cpp
@@ -40,7 +40,6 @@
bool RealignStack;
bool VerboseAsm;
bool DisableJumpTables;
- bool DisableCorrectBranchFolding;
}
static cl::opt<bool, true> PrintCode("print-machineinstrs",
@@ -164,11 +163,6 @@
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
//