[llvm-commits] CVS: llvm/lib/CodeGen/BranchFolding.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen:

BranchFolding.cpp updated: 1.20 -> 1.21
---
Log message:

Enable tail merging by default.


---
Diffs of the changes:  (+0 -4)

 BranchFolding.cpp |    4 ----
 1 files changed, 4 deletions(-)


Index: llvm/lib/CodeGen/BranchFolding.cpp
diff -u llvm/lib/CodeGen/BranchFolding.cpp:1.20 llvm/lib/CodeGen/BranchFolding.cpp:1.21
--- llvm/lib/CodeGen/BranchFolding.cpp:1.20	Mon Oct 23 09:56:37 2006
+++ llvm/lib/CodeGen/BranchFolding.cpp	Mon Oct 23 17:10:12 2006
@@ -30,7 +30,6 @@
 static Statistic<> NumDeadBlocks("branchfold", "Number of dead blocks removed");
 static Statistic<> NumBranchOpts("branchfold", "Number of branches optimized");
 static Statistic<> NumTailMerge ("branchfold", "Number of block tails merged");
-static cl::opt<bool> EnableTailMerge("enable-tail-merge", cl::init(false));
 
 namespace {
   struct BranchFolder : public MachineFunctionPass {
@@ -207,9 +206,6 @@
 bool BranchFolder::TailMergeBlocks(MachineFunction &MF) {
   MadeChange = false;
   
-  if (!EnableTailMerge)
-    return false;
-  
   // Find blocks with no successors.
   std::vector<std::pair<unsigned,MachineBasicBlock*> > MergePotentials;
   for (MachineFunction::iterator I = MF.begin(), E = MF.end(); I != E; ++I) {