[llvm-commits] [llvm] r54336 - in /llvm/trunk: include/llvm/Target/TargetOptions.h lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp lib/Target/TargetMachine.cpp

[Owen Anderson]

Author: resistor
Date: Mon Aug  4 19:27:28 2008
New Revision: 54336

URL: http://llvm.org/viewvc/llvm-project?rev=54336&view=rev
Log:
This option doesn't need to be a target option.  It can be in SDISel instead.

Modified:
    llvm/trunk/include/llvm/Target/TargetOptions.h
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
    llvm/trunk/lib/Target/TargetMachine.cpp

Modified: llvm/trunk/include/llvm/Target/TargetOptions.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetOptions.h?rev=54336&r1=54335&r2=54336&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetOptions.h (original)
+++ llvm/trunk/include/llvm/Target/TargetOptions.h Mon Aug  4 19:27:28 2008
@@ -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

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=54336&r1=54335&r2=54336&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Mon Aug  4 19:27:28 2008
@@ -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

Modified: llvm/trunk/lib/Target/TargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetMachine.cpp?rev=54336&r1=54335&r2=54336&view=diff

==============================================================================
--- llvm/trunk/lib/Target/TargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/TargetMachine.cpp Mon Aug  4 19:27:28 2008
@@ -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
 //