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

[Jim Grosbach]

Author: grosbach
Date: Fri Jun  4 15:19:41 2010
New Revision: 105482

URL: http://llvm.org/viewvc/llvm-project?rev=105482&view=rev
Log:
merge 105481

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

Propchange: llvm/branches/Apple/Troughton/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  4 15:19:41 2010
@@ -1 +1 @@
-/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470
+/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105481

Modified: llvm/branches/Apple/Troughton/lib/CodeGen/RegisterScavenging.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/lib/CodeGen/RegisterScavenging.cpp?rev=105482&r1=105481&r2=105482&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/lib/CodeGen/RegisterScavenging.cpp (original)
+++ llvm/branches/Apple/Troughton/lib/CodeGen/RegisterScavenging.cpp Fri Jun  4 15:19:41 2010
@@ -258,6 +258,10 @@
 
   bool inVirtLiveRange = false;
   for (++MI; InstrLimit > 0 && MI != ME; ++MI, --InstrLimit) {
+    if (MI->isDebugValue()) {
+      ++InstrLimit; // Don't count debug instructions
+      continue;
+    }
     bool isVirtKillInsn = false;
     bool isVirtDefInsn = false;
     // Remove any candidates touched by instruction.