From: David Greene <greened@obbligato.org>
Date: Fri, 4 Dec 2009 23:08:02 +0000 (+0000)
Subject: Fix a bad merge.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=03c8406fc19658a3a8dc8ee00fddc88160038683;p=oota-llvm.git

Fix a bad merge.


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

diff --git a/include/llvm/Target/TargetInstrInfo.h b/include/llvm/Target/TargetInstrInfo.h
index ee3b21ad695..fd048f9810d 100644
--- a/include/llvm/Target/TargetInstrInfo.h
+++ b/include/llvm/Target/TargetInstrInfo.h
@@ -547,13 +547,6 @@ public:
   /// length.
   virtual unsigned getInlineAsmLength(const char *Str,
                                       const MCAsmInfo &MAI) const;
-
-  /// TailDuplicationLimit - Returns the limit on the number of instructions
-  /// in basic block MBB beyond which it will not be tail-duplicated.
-  virtual unsigned TailDuplicationLimit(const MachineBasicBlock &MBB,
-                                        unsigned DefaultLimit) const {
-    return DefaultLimit;
-  }
 };
 
 /// TargetInstrInfoImpl - This is the default implementation of