[llvm-commits] [llvm] r121774 - /llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Tue Dec 14 11:47:36 2010
New Revision: 121774

URL: http://llvm.org/viewvc/llvm-project?rev=121774&view=rev
Log:
Q.seenAllInterferences() must be called after Q.collectInterferingVRegs().

Modified:
    llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp

Modified: llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp?rev=121774&r1=121773&r2=121774&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp (original)
+++ llvm/trunk/lib/CodeGen/RegAllocGreedy.cpp Tue Dec 14 11:47:36 2010
@@ -175,9 +175,9 @@
   // Check direct interferences.
   LiveIntervalUnion::Query &Q = query(VirtReg, PhysReg);
   if (Q.checkInterference()) {
+    Q.collectInterferingVRegs(1);
     if (!Q.seenAllInterferences())
       return 0;
-    Q.collectInterferingVRegs(1);
     Interference = Q.interferingVRegs().front();
   }
 
@@ -185,9 +185,11 @@
   for (const unsigned *AliasI = TRI->getAliasSet(PhysReg); *AliasI; ++AliasI) {
     LiveIntervalUnion::Query &Q = query(VirtReg, *AliasI);
     if (Q.checkInterference()) {
-      if (Interference || !Q.seenAllInterferences())
+      if (Interference)
         return 0;
       Q.collectInterferingVRegs(1);
+      if (!Q.seenAllInterferences())
+        return 0;
       Interference = Q.interferingVRegs().front();
     }
   }