1 files changed, 12 insertions, 1 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 5a97aa6b39..42ba89e41b 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -58,6 +58,14 @@ ViewSchedDAGs("view-sched-dags", cl::Hidden,
 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.
@@ -3170,7 +3178,10 @@ void SelectionDAGISel::CodeGenAndEmitDAG(SelectionDAG &DAG) {
   DAG.Combine(true);
   
   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);