[llvm-branch-commits] [llvm-branch] r98779 - in /llvm/branches/Apple/Morbo: ./ lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

[Devang Patel]

Author: dpatel
Date: Wed Mar 17 18:58:27 2010
New Revision: 98779

URL: http://llvm.org/viewvc/llvm-project?rev=98779&view=rev
Log:
merge from mainline
$ svn merge -c 98778 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r98778 into '.':
U    lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp



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

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

Modified: llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=98779&r1=98778&r2=98779&view=diff
==============================================================================
--- llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
+++ llvm/branches/Apple/Morbo/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Wed Mar 17 18:58:27 2010
@@ -4277,6 +4277,9 @@
          --BBI) {
       if (&*BBI == I)
         break;
+      // Debug info intrinsic does not intefer during tail call optimization.
+      if (isa<DbgInfoIntrinsic>(BBI))
+        continue;
       if (BBI->mayHaveSideEffects() || BBI->mayReadFromMemory() ||
           !BBI->isSafeToSpeculativelyExecute())
         return false;