6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-05-19 13:38:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix bugs in iterator invalidation

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44174 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Berlin 2007-11-15 18:06:49 +00:00
parent 560a737e07
commit 07268172ff
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/llvm/ADT/SparseBitVector.h
View File

@ -614,8 +614,10 @@ public:
// Loop through, intersecting as we go, erasing elements when necessary. // Loop through, intersecting as we go, erasing elements when necessary.
while (Iter2 != RHS.Elements.end()) { while (Iter2 != RHS.Elements.end()) {
if (Iter1 == Elements.end()) if (Iter1 == Elements.end()) {
CurrElementIter = Elements.begin();
return changed; return changed;
}
if (Iter1->index() > Iter2->index()) { if (Iter1->index() > Iter2->index()) {
++Iter2; ++Iter2;
@ -654,8 +656,10 @@ public:
// Loop through, intersecting as we go, erasing elements when necessary. // Loop through, intersecting as we go, erasing elements when necessary.
while (Iter2 != RHS.Elements.end()) { while (Iter2 != RHS.Elements.end()) {
if (Iter1 == Elements.end()) if (Iter1 == Elements.end()) {
CurrElementIter = Elements.begin();
return changed; return changed;
}
if (Iter1->index() > Iter2->index()) { if (Iter1->index() > Iter2->index()) {
++Iter2; ++Iter2;
@ -689,6 +693,7 @@ public:
const SparseBitVector<ElementSize> &RHS2) const SparseBitVector<ElementSize> &RHS2)
{ {
Elements.clear(); Elements.clear();
CurrElementIter = Elements.begin();
ElementListConstIter Iter1 = RHS1.Elements.begin(); ElementListConstIter Iter1 = RHS1.Elements.begin();
ElementListConstIter Iter2 = RHS2.Elements.begin(); ElementListConstIter Iter2 = RHS2.Elements.begin();
@ -732,7 +737,6 @@ public:
++Iter1; ++Iter1;
} }
CurrElementIter = Elements.begin();
return; return;
} }