Enable tail merging by default.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@31140 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp
index 4643c7414ff4965c61b46ef32d14125862791c3e..144dbf690832c98856cfbdd9317ecbb3ac009ffa 100644 (file)
--- a/lib/CodeGen/BranchFolding.cpp
+++ b/lib/CodeGen/BranchFolding.cpp
@@ -30,7 +30,6 @@ using namespace llvm;
 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 @@ void BranchFolder::ReplaceTailWithBranchTo(MachineBasicBlock::iterator OldInst,
 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) {