I didn't mean to check this in. :(

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

diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp
index 0a6cb2d3411f812ffd3f2f85e225caa65a4824df..8a54051673b3d569710a02719b9fb034592d7beb 100644 (file)
--- a/lib/CodeGen/LiveIntervalAnalysis.cpp
+++ b/lib/CodeGen/LiveIntervalAnalysis.cpp
@@ -58,8 +58,6 @@ namespace {
   EnableJoining("join-liveintervals",
                 cl::desc("Join compatible live intervals"),
                 cl::init(true));
-  cl::opt<bool>
-  DisableHack("disable-hack");
 };
 
 void LiveIntervals::getAnalysisUsage(AnalysisUsage &AU) const
@@ -495,7 +493,7 @@ exit:
   // the physreg, then the new fragment has the same value as the one copied
   // into the vreg.
   if (interval.reg == DestReg && !interval.empty() &&
-      MRegisterInfo::isVirtualRegister(SrcReg) && !DisableHack) {
+      MRegisterInfo::isVirtualRegister(SrcReg)) {
 
     // Get the live interval for the vreg, see if it is defined by a copy.
     LiveInterval &SrcInterval = getOrCreateInterval(SrcReg);