make smallptrset more const and type correct, which caught a few

minor bugs.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@43782 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2007-11-06 22:12:43 +00:00
parent 0d97426b7b
commit 373a733be0
2 changed files with 30 additions and 15 deletions

View File

@ -91,21 +91,19 @@ public:
NumTombstones = 0;
}
/// insert - This returns true if the pointer was new to the set, false if it
/// was already in the set.
bool insert(const void * Ptr);
protected:
/// insert_imp - This returns true if the pointer was new to the set, false if
/// it was already in the set. This is hidden from the client so that the
/// derived class can check that the right type of pointer is passed in.
bool insert_imp(const void * Ptr);
template <typename IterT>
void insert(IterT I, IterT E) {
for (; I != E; ++I)
insert((void*)*I);
}
/// erase_imp - If the set contains the specified pointer, remove it and
/// return true, otherwise return false. This is hidden from the client so
/// that the derived class can check that the right type of pointer is passed
/// in.
bool erase_imp(const void * Ptr);
/// erase - If the set contains the specified pointer, remove it and return
/// true, otherwise return false.
bool erase(const void * Ptr);
bool count(const void * Ptr) const {
bool count_imp(const void * Ptr) const {
if (isSmall()) {
// Linear search for the item.
for (const void *const *APtr = SmallArray,
@ -232,6 +230,23 @@ public:
insert(I, E);
}
/// insert - This returns true if the pointer was new to the set, false if it
/// was already in the set.
bool insert(PtrType Ptr) { return insert_imp(Ptr); }
/// erase - If the set contains the specified pointer, remove it and return
/// true, otherwise return false.
bool erase(PtrType Ptr) { return erase_imp(Ptr); }
/// count - Return true if the specified pointer is in the set.
bool count(PtrType Ptr) const { return count_imp(Ptr); }
template <typename IterT>
void insert(IterT I, IterT E) {
for (; I != E; ++I)
insert(*I);
}
typedef SmallPtrSetIterator<PtrType> iterator;
typedef SmallPtrSetIterator<PtrType> const_iterator;
inline iterator begin() const {

View File

@ -36,7 +36,7 @@ void SmallPtrSetImpl::shrink_and_clear() {
CurArray[CurArraySize] = 0;
}
bool SmallPtrSetImpl::insert(const void * Ptr) {
bool SmallPtrSetImpl::insert_imp(const void * Ptr) {
if (isSmall()) {
// Check to see if it is already in the set.
for (const void **APtr = SmallArray, **E = SmallArray+NumElements;
@ -69,7 +69,7 @@ bool SmallPtrSetImpl::insert(const void * Ptr) {
return true;
}
bool SmallPtrSetImpl::erase(const void * Ptr) {
bool SmallPtrSetImpl::erase_imp(const void * Ptr) {
if (isSmall()) {
// Check to see if it is in the set.
for (const void **APtr = SmallArray, **E = SmallArray+NumElements;