[llvm-branch-commits] [llvm-branch] r106153 - in /llvm/branches/Apple/Troughton: ./ lib/CodeGen/LiveIntervalAnalysis.cpp test/CodeGen/Thumb2/crash.ll

[Jakob Stoklund Olesen]

Author: stoklund
Date: Wed Jun 16 16:30:39 2010
New Revision: 106153

URL: http://llvm.org/viewvc/llvm-project?rev=106153&view=rev
Log:
--- Merging r106152 into '.':
A    test/CodeGen/Thumb2/crash.ll
U    lib/CodeGen/LiveIntervalAnalysis.cpp


Added:
    llvm/branches/Apple/Troughton/test/CodeGen/Thumb2/crash.ll
      - copied unchanged from r106152, llvm/trunk/test/CodeGen/Thumb2/crash.ll
Modified:
    llvm/branches/Apple/Troughton/   (props changed)
    llvm/branches/Apple/Troughton/lib/CodeGen/LiveIntervalAnalysis.cpp

Propchange: llvm/branches/Apple/Troughton/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 16 16:30:39 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,105997-105998,106004,106021,106024,106051,106146,106149
+/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,105997-105998,106004,106021,106024,106051,106146,106149,106152

Modified: llvm/branches/Apple/Troughton/lib/CodeGen/LiveIntervalAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=106153&r1=106152&r2=106153&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/lib/CodeGen/LiveIntervalAnalysis.cpp (original)
+++ llvm/branches/Apple/Troughton/lib/CodeGen/LiveIntervalAnalysis.cpp Wed Jun 16 16:30:39 2010
@@ -434,11 +434,6 @@
       // are actually two values in the live interval.  Because of this we
       // need to take the LiveRegion that defines this register and split it
       // into two values.
-      // Two-address vregs should always only be redefined once.  This means
-      // that at this point, there should be exactly one value number in it.
-      assert((PartReDef || interval.containsOneValue()) &&
-             "Unexpected 2-addr liveint!");
-      SlotIndex DefIndex = interval.getValNumInfo(0)->def.getDefIndex();
       SlotIndex RedefIndex = MIIdx.getDefIndex();
       if (MO.isEarlyClobber())
         RedefIndex = MIIdx.getUseIndex();
@@ -446,8 +441,9 @@
       const LiveRange *OldLR =
         interval.getLiveRangeContaining(RedefIndex.getUseIndex());
       VNInfo *OldValNo = OldLR->valno;
+      SlotIndex DefIndex = OldValNo->def.getDefIndex();
 
-      // Delete the initial value, which should be short and continuous,
+      // Delete the previous value, which should be short and continuous,
       // because the 2-addr copy must be in the same MBB as the redef.
       interval.removeRange(DefIndex, RedefIndex);