[llvm-branch-commits] [llvm-branch] r70324 - in /llvm/branches/Apple/Dib: lib/CodeGen/LiveInterval.cpp test/CodeGen/X86/2009-04-27-CoalescerAssert.ll

[Bill Wendling]

Author: void
Date: Tue Apr 28 16:13:51 2009
New Revision: 70324

URL: http://llvm.org/viewvc/llvm-project?rev=70324&view=rev
Log:
--- Merging r70291 into '.':
A    test/CodeGen/X86/2009-04-27-CoalescerAssert.ll
U    lib/CodeGen/LiveInterval.cpp

Fix PR4034. Bug in LiveInterval::join when it's compacting new valno's.

Added:
    llvm/branches/Apple/Dib/test/CodeGen/X86/2009-04-27-CoalescerAssert.ll
      - copied unchanged from r70291, llvm/trunk/test/CodeGen/X86/2009-04-27-CoalescerAssert.ll
Modified:
    llvm/branches/Apple/Dib/lib/CodeGen/LiveInterval.cpp

Modified: llvm/branches/Apple/Dib/lib/CodeGen/LiveInterval.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/lib/CodeGen/LiveInterval.cpp?rev=70324&r1=70323&r2=70324&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/lib/CodeGen/LiveInterval.cpp (original)
+++ llvm/branches/Apple/Dib/lib/CodeGen/LiveInterval.cpp Tue Apr 28 16:13:51 2009
@@ -458,7 +458,7 @@
   for (unsigned i = 0; i < NumNewVals; ++i) {
     VNInfo *VNI = NewVNInfo[i];
     if (VNI) {
-      if (i >= NumVals)
+      if (NumValNos >= NumVals)
         valnos.push_back(VNI);
       else 
         valnos[NumValNos] = VNI;