[llvm-branch-commits] [llvm-branch] r98747 - in /llvm/branches/Apple/Morbo: ./ lib/CodeGen/TailDuplication.cpp

[Devang Patel]

Author: dpatel
Date: Wed Mar 17 13:13:26 2010
New Revision: 98747

URL: http://llvm.org/viewvc/llvm-project?rev=98747&view=rev
Log:
merge from mainline.
--- Merging r98675 into '.':
U    lib/CodeGen/TailDuplication.cpp


Modified:
    llvm/branches/Apple/Morbo/   (props changed)
    llvm/branches/Apple/Morbo/lib/CodeGen/TailDuplication.cpp

Propchange: llvm/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 17 13:13:26 2010
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Hermes:96832,96835,96858,96870,96876,96879
-/llvm/trunk:98602,98604,98612,98615-98616,98686,98743
+/llvm/trunk:98602,98604,98612,98615-98616,98675,98686,98743

Modified: llvm/branches/Apple/Morbo/lib/CodeGen/TailDuplication.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/CodeGen/TailDuplication.cpp?rev=98747&r1=98746&r2=98747&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/CodeGen/TailDuplication.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/CodeGen/TailDuplication.cpp Wed Mar 17 13:13:26 2010
@@ -495,7 +495,7 @@
     if (InstrCount == MaxDuplicateCount) return false;
     // Remember if we saw a call.
     if (I->getDesc().isCall()) HasCall = true;
-    if (!I->isPHI())
+    if (!I->isPHI() && !I->isDebugValue())
       InstrCount += 1;
   }
   // Heuristically, don't tail-duplicate calls if it would expand code size,