Remove LiveIntervals::trackingRegUnits().

With regunit liveness permanently enabled, this function would always
return true.

Also remove now obsolete code for checking physreg interference.

llvm-svn: 159006

1 files changed, 5 insertions, 19 deletions

diff --git a/llvm/lib/CodeGen/RegisterCoalescer.cpp b/llvm/lib/CodeGen/RegisterCoalescer.cpp
index de58b82d3a3..4f302773170 100644
--- a/llvm/lib/CodeGen/RegisterCoalescer.cpp
+++ b/llvm/lib/CodeGen/RegisterCoalescer.cpp
@@ -1100,26 +1100,12 @@ bool RegisterCoalescer::joinReservedPhysReg(CoalescerPair &CP) {
 
   // Deny any overlapping intervals.  This depends on all the reserved
   // register live ranges to look like dead defs.
-  if (LIS->trackingRegUnits()) {
-    for (MCRegUnitIterator UI(CP.getDstReg(), TRI); UI.isValid(); ++UI)
-      if (RHS.overlaps(LIS->getRegUnit(*UI))) {
-        DEBUG(dbgs() << "\t\tInterference: " << PrintRegUnit(*UI, TRI) << '\n');
-        return false;
-      }
-  } else {
-    for (MCRegAliasIterator AS(CP.getDstReg(), TRI, true); AS.isValid(); ++AS) {
-      if (!LIS->hasInterval(*AS)) {
-        // Make sure at least DstReg itself exists before attempting a join.
-        if (*AS == CP.getDstReg())
-          LIS->getOrCreateInterval(CP.getDstReg());
-        continue;
-      }
-      if (RHS.overlaps(LIS->getInterval(*AS))) {
-        DEBUG(dbgs() << "\t\tInterference: " << PrintReg(*AS, TRI) << '\n');
-        return false;
-      }
+  for (MCRegUnitIterator UI(CP.getDstReg(), TRI); UI.isValid(); ++UI)
+    if (RHS.overlaps(LIS->getRegUnit(*UI))) {
+      DEBUG(dbgs() << "\t\tInterference: " << PrintRegUnit(*UI, TRI) << '\n');
+      return false;
     }
-  }
+
   // Skip any value computations, we are not adding new values to the
   // reserved register.  Also skip merging the live ranges, the reserved
   // register live range doesn't need to be accurate as long as all the