From 999fa3bf1fc8c684626085e8b8b398c4623550dc Mon Sep 17 00:00:00 2001
From: Stuart Hastings <stuart@apple.com>
Date: Tue, 10 May 2011 21:20:03 +0000
Subject: Correctly walk through nested and adjacent CALLSEQ_START nodes.  No
 test case; I've only seen this on a release branch, and I can't get it to
 reproduce on trunk.  rdar://problem/7662569

llvm-svn: 131152
---
 llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp')

diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index 2b6c56eafd7..e2e6691ba7c 100644
--- a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -324,6 +324,7 @@ static SDNode *FindCallStartFromCallEnd(SDNode *Node) {
     case ISD::CALLSEQ_START:
       if (!nested)
         return Node;
+      Node = Node->getOperand(0).getNode();
       nested--;
       break;
     case ISD::CALLSEQ_END:
@@ -331,7 +332,7 @@ static SDNode *FindCallStartFromCallEnd(SDNode *Node) {
       break;
     }
   }
-  return 0;
+  return (Node->getOpcode() == ISD::CALLSEQ_START) ? Node : 0;
 }
 
 /// LegalizeAllNodesNotLeadingTo - Recursively walk the uses of N, looking to
-- 
cgit v1.2.3