diff options
author | David Greene <greened@obbligato.org> | 2007-06-29 02:49:11 +0000 |
---|---|---|
committer | David Greene <greened@obbligato.org> | 2007-06-29 02:49:11 +0000 |
commit | 9468bfd9323df5ffc2f3e64cb95c726567474b5e (patch) | |
tree | c698e33e3fcdbc4b6c27db955ac23cedb79b7a97 /llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | |
parent | 5b6f7555755585f1041fbdfe8d04f03a4767f836 (diff) | |
download | bcm5719-llvm-9468bfd9323df5ffc2f3e64cb95c726567474b5e.tar.gz bcm5719-llvm-9468bfd9323df5ffc2f3e64cb95c726567474b5e.zip |
Fix reference to cached end iterator invalidated by an erase operation.
Uncovered by _GLIBCXX_DEBUG.
llvm-svn: 37795
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp')
-rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index 224006106b2..6251d381be1 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; |