From 9468bfd9323df5ffc2f3e64cb95c726567474b5e Mon Sep 17 00:00:00 2001
From: David Greene <greened@obbligato.org>
Date: Fri, 29 Jun 2007 02:49:11 +0000
Subject: [PATCH] Fix reference to cached end iterator invalidated by an erase
 operation. Uncovered by _GLIBCXX_DEBUG.

llvm-svn: 37795
---
 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 224006106b2f..6251d381be1b 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -1700,7 +1700,9 @@ unsigned SelectionDAGLowering::Clusterify(CaseVector& Cases,
 
   // Merge case into clusters
   if (Cases.size()>=2)
-    for (CaseItr I=Cases.begin(), J=++(Cases.begin()), E=Cases.end(); J!=E; ) {
+    // Cray [dag]: Must recompute end() each iteration because it may
+    // be invalidated by erase if we hold on to it
+    for (CaseItr I=Cases.begin(), J=++(Cases.begin()); J!=Cases.end(); ) {
       int64_t nextValue = cast<ConstantInt>(J->Low)->getSExtValue();
       int64_t currentValue = cast<ConstantInt>(I->High)->getSExtValue();
       MachineBasicBlock* nextBB = J->BB;