[llvm-branch-commits] [llvm-branch] r106023 - in /llvm/branches/Apple/Troughton: ./ lib/CodeGen/SimpleRegisterCoalescing.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Tue Jun 15 13:52:02 2010
New Revision: 106023

URL: http://llvm.org/viewvc/llvm-project?rev=106023&view=rev
Log:
$ svn merge -c 106021 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r106021 into '.':
U    lib/CodeGen/SimpleRegisterCoalescing.cpp


Modified:
    llvm/branches/Apple/Troughton/   (props changed)
    llvm/branches/Apple/Troughton/lib/CodeGen/SimpleRegisterCoalescing.cpp

Propchange: llvm/branches/Apple/Troughton/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 15 13:52:02 2010
@@ -1 +1 @@
-/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105473,105481,105498,105541,105554,105557,105585-105586,105634,105653,105665,105669,105677,105745,105749,105774-105775,105836,105845,105862,105938,105959,105965,105969,105982,105990-105991,105998,106004
+/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105473,105481,105498,105541,105554,105557,105585-105586,105634,105653,105665,105669,105677,105745,105749,105774-105775,105836,105845,105862,105938,105959,105965,105969,105982,105990-105991,105998,106004,106021

Modified: llvm/branches/Apple/Troughton/lib/CodeGen/SimpleRegisterCoalescing.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/lib/CodeGen/SimpleRegisterCoalescing.cpp?rev=106023&r1=106022&r2=106023&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/lib/CodeGen/SimpleRegisterCoalescing.cpp (original)
+++ llvm/branches/Apple/Troughton/lib/CodeGen/SimpleRegisterCoalescing.cpp Tue Jun 15 13:52:02 2010
@@ -2323,7 +2323,8 @@
 
       // Figure out the value # from the RHS.
       LiveRange *lr = RHS.getLiveRangeContaining(VNI->def.getPrevSlot());
-      assert(lr && "Cannot find live range");
+      // The copy could be to an aliased physreg.
+      if (!lr) continue;
       LHSValsDefinedFromRHS[VNI] = lr->valno;
     }
 
@@ -2342,7 +2343,8 @@
 
       // Figure out the value # from the LHS.
       LiveRange *lr = LHS.getLiveRangeContaining(VNI->def.getPrevSlot());
-      assert(lr && "Cannot find live range");
+      // The copy could be to an aliased physreg.
+      if (!lr) continue;
       RHSValsDefinedFromLHS[VNI] = lr->valno;
     }