From c3a32d190c458fa14c4a6333c942e0aefd56da7e Mon Sep 17 00:00:00 2001 From: Daniel Berlin Date: Thu, 4 Oct 2007 05:25:51 +0000 Subject: [PATCH] Make SparseBitVector::set actually work properly when sets are not in ascending or descending order. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@42604 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/SparseBitVector.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/include/llvm/ADT/SparseBitVector.h b/include/llvm/ADT/SparseBitVector.h index a6df0acdc77..d1e91250680 100644 --- a/include/llvm/ADT/SparseBitVector.h +++ b/include/llvm/ADT/SparseBitVector.h @@ -334,9 +334,8 @@ class SparseBitVector { --ElementIter; } else { while (ElementIter != Elements.end() && - ElementIter->index() <= ElementIndex) + ElementIter->index() < ElementIndex) ++ElementIter; - --ElementIter; } CurrElementIter = ElementIter; return ElementIter; @@ -536,10 +535,17 @@ public: if (ElementIter == Elements.end() || ElementIter->index() != ElementIndex) { Element = new SparseBitVectorElement(ElementIndex); - // Insert does insert before, and lower bound gives the one before. - ElementIter = Elements.insert(++ElementIter, Element); + // We may have hit the beginning of our SparseBitVector, in which case, + // we may need to insert right after this element, which requires moving + // the current iterator forward one, because insert does insert before. + if (ElementIter->index() < ElementIndex) + ElementIter = Elements.insert(++ElementIter, Element); + else + ElementIter = Elements.insert(ElementIter, Element); } } + CurrElementIter = ElementIter; + ElementIter->set(Idx % ElementSize); } -- 2.34.1