Remove the temporary option: -no-isel-fold-inflight
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28012 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/CodeGen/SelectionDAGISel.h b/include/llvm/CodeGen/SelectionDAGISel.h
index 52d85f6..6ebcda3 100644
--- a/include/llvm/CodeGen/SelectionDAGISel.h
+++ b/include/llvm/CodeGen/SelectionDAGISel.h
@@ -40,7 +40,6 @@
SSARegMap *RegMap;
SelectionDAG *CurDAG;
MachineBasicBlock *BB;
- bool FoldNodeInFlight;
SelectionDAGISel(TargetLowering &tli) : TLI(tli), JT(0,0,0,0) {}
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index fe9398f..d3991a6 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -58,14 +58,6 @@
static const bool ViewISelDAGs = 0, ViewSchedDAGs = 0;
#endif
-namespace {
-static cl::opt<bool>
-NoFoldNodeInFlight(
- "no-isel-fold-inflight",
- cl::Hidden,
- cl::desc("Do not attempt to fold a node even if it is being selected"));
-}
-
// Scheduling heuristics
enum SchedHeuristics {
defaultScheduling, // Let the target specify its preference.
@@ -3177,9 +3169,6 @@
if (ViewISelDAGs) DAG.viewGraph();
- // TEMPORARY.
- FoldNodeInFlight = !NoFoldNodeInFlight;
-
// Third, instruction select all of the operations to machine code, adding the
// code to the MachineBasicBlock.
InstructionSelectBasicBlock(DAG);
diff --git a/utils/TableGen/DAGISelEmitter.cpp b/utils/TableGen/DAGISelEmitter.cpp
index b4317ff..5f44262 100644
--- a/utils/TableGen/DAGISelEmitter.cpp
+++ b/utils/TableGen/DAGISelEmitter.cpp
@@ -2131,8 +2131,7 @@
if (!isRoot) {
const SDNodeInfo &CInfo = ISE.getSDNodeInfo(N->getOperator());
// Not in flight?
- emitCheck("(FoldNodeInFlight || InFlightSet.count("
- + RootName + ".Val) == 0)");
+ emitCheck("InFlightSet.count(" + RootName + ".Val) == 0");
// Multiple uses of actual result?
emitCheck(RootName + ".hasOneUse()");
EmittedUseCheck = true;