projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a typo that made ImmutableMap::getMaxElement() useless.
[oota-llvm.git]
/
include
/
llvm
/
ADT
/
SmallPtrSet.h
diff --git
a/include/llvm/ADT/SmallPtrSet.h
b/include/llvm/ADT/SmallPtrSet.h
index ef0812592be1b946ae65c7eb4256e9ffa602f671..3bb883088c598d489f07534a446e096e6be93fb5 100644
(file)
--- a/
include/llvm/ADT/SmallPtrSet.h
+++ b/
include/llvm/ADT/SmallPtrSet.h
@@
-15,11
+15,13
@@
#ifndef LLVM_ADT_SMALLPTRSET_H
#define LLVM_ADT_SMALLPTRSET_H
#ifndef LLVM_ADT_SMALLPTRSET_H
#define LLVM_ADT_SMALLPTRSET_H
+#include "llvm/Support/Compiler.h"
+#include "llvm/Support/DataTypes.h"
+#include "llvm/Support/PointerLikeTypeTraits.h"
#include <cassert>
#include <cassert>
+#include <cstddef>
#include <cstring>
#include <iterator>
#include <cstring>
#include <iterator>
-#include "llvm/System/DataTypes.h"
-#include "llvm/Support/PointerLikeTypeTraits.h"
namespace llvm {
namespace llvm {
@@
-46,26
+48,26
@@
class SmallPtrSetIteratorImpl;
class SmallPtrSetImpl {
friend class SmallPtrSetIteratorImpl;
protected:
class SmallPtrSetImpl {
friend class SmallPtrSetIteratorImpl;
protected:
- /// CurArray - This is the current set of buckets. If it points to
- /// SmallArray, then the set is in 'small mode'.
+ /// SmallArray - Points to a fixed size set of buckets, used in 'small mode'.
+ const void **SmallArray;
+ /// CurArray - This is the current set of buckets. If equal to SmallArray,
+ /// then the set is in 'small mode'.
const void **CurArray;
/// CurArraySize - The allocated size of CurArray, always a power of two.
/// Note that CurArray points to an array that has CurArraySize+1 elements in
/// it, so that the end iterator actually points to valid memory.
unsigned CurArraySize;
const void **CurArray;
/// CurArraySize - The allocated size of CurArray, always a power of two.
/// Note that CurArray points to an array that has CurArraySize+1 elements in
/// it, so that the end iterator actually points to valid memory.
unsigned CurArraySize;
- // If small, this is # elts allocated conse
q
utively
+ // If small, this is # elts allocated conse
c
utively
unsigned NumElements;
unsigned NumTombstones;
unsigned NumElements;
unsigned NumTombstones;
- const void *SmallArray[1]; // Must be last ivar.
// Helper to copy construct a SmallPtrSet.
// Helper to copy construct a SmallPtrSet.
- SmallPtrSetImpl(const SmallPtrSetImpl& that);
- explicit SmallPtrSetImpl(unsigned SmallSize) {
+ SmallPtrSetImpl(const void **SmallStorage, const SmallPtrSetImpl& that);
+ explicit SmallPtrSetImpl(const void **SmallStorage, unsigned SmallSize) :
+ SmallArray(SmallStorage), CurArray(SmallStorage), CurArraySize(SmallSize) {
assert(SmallSize && (SmallSize & (SmallSize-1)) == 0 &&
"Initial size must be a power of two!");
assert(SmallSize && (SmallSize & (SmallSize-1)) == 0 &&
"Initial size must be a power of two!");
- CurArray = &SmallArray[0];
- CurArraySize = SmallSize;
// The end pointer, always valid, is set to a valid element to help the
// iterator.
CurArray[SmallSize] = 0;
// The end pointer, always valid, is set to a valid element to help the
// iterator.
CurArray[SmallSize] = 0;
@@
-123,19
+125,20
@@
protected:
}
private:
}
private:
- bool isSmall() const { return CurArray ==
&SmallArray[0]
; }
+ bool isSmall() const { return CurArray ==
SmallArray
; }
- unsigned Hash(const void *Ptr) const {
- return static_cast<unsigned>(((uintptr_t)Ptr >> 4) & (CurArraySize-1));
- }
const void * const *FindBucketFor(const void *Ptr) const;
void shrink_and_clear();
/// Grow - Allocate a larger backing store for the buckets and move it over.
const void * const *FindBucketFor(const void *Ptr) const;
void shrink_and_clear();
/// Grow - Allocate a larger backing store for the buckets and move it over.
- void Grow();
+ void Grow(
unsigned NewSize
);
- void operator=(const SmallPtrSetImpl &RHS)
; // DO NOT IMPLEMENT.
+ void operator=(const SmallPtrSetImpl &RHS)
LLVM_DELETED_FUNCTION;
protected:
protected:
+ /// swap - Swaps the elements of two sets.
+ /// Note: This method assumes that both sets have the same small size.
+ void swap(SmallPtrSetImpl &RHS);
+
void CopyFrom(const SmallPtrSetImpl &RHS);
};
void CopyFrom(const SmallPtrSetImpl &RHS);
};
@@
-199,29
+202,29
@@
public:
}
};
}
};
-///
Next
PowerOfTwo - This is a helper template that rounds N up to the next
-/// power of two.
+///
RoundUpTo
PowerOfTwo - This is a helper template that rounds N up to the next
+/// power of two
(which means N itself if N is already a power of two)
.
template<unsigned N>
template<unsigned N>
-struct
Next
PowerOfTwo;
+struct
RoundUpTo
PowerOfTwo;
-///
NextPowerOfTwoH - If N is not a power of two, increase it. This is a helper
-///
template used to implement Next
PowerOfTwo.
+///
RoundUpToPowerOfTwoH - If N is not a power of two, increase it. This is a
+///
helper template used to implement RoundUpTo
PowerOfTwo.
template<unsigned N, bool isPowerTwo>
template<unsigned N, bool isPowerTwo>
-struct
Next
PowerOfTwoH {
+struct
RoundUpTo
PowerOfTwoH {
enum { Val = N };
};
template<unsigned N>
enum { Val = N };
};
template<unsigned N>
-struct
Next
PowerOfTwoH<N, false> {
+struct
RoundUpTo
PowerOfTwoH<N, false> {
enum {
// We could just use NextVal = N+1, but this converges faster. N|(N-1) sets
// the right-most zero bits to one all at once, e.g. 0b0011000 -> 0b0011111.
enum {
// We could just use NextVal = N+1, but this converges faster. N|(N-1) sets
// the right-most zero bits to one all at once, e.g. 0b0011000 -> 0b0011111.
- Val =
Next
PowerOfTwo<(N|(N-1)) + 1>::Val
+ Val =
RoundUpTo
PowerOfTwo<(N|(N-1)) + 1>::Val
};
};
template<unsigned N>
};
};
template<unsigned N>
-struct
Next
PowerOfTwo {
- enum { Val =
Next
PowerOfTwoH<N, (N&(N-1)) == 0>::Val };
+struct
RoundUpTo
PowerOfTwo {
+ enum { Val =
RoundUpTo
PowerOfTwoH<N, (N&(N-1)) == 0>::Val };
};
};
@@
-232,16
+235,17
@@
struct NextPowerOfTwo {
template<class PtrType, unsigned SmallSize>
class SmallPtrSet : public SmallPtrSetImpl {
// Make sure that SmallSize is a power of two, round up if not.
template<class PtrType, unsigned SmallSize>
class SmallPtrSet : public SmallPtrSetImpl {
// Make sure that SmallSize is a power of two, round up if not.
- enum { SmallSizePowTwo = NextPowerOfTwo<SmallSize>::Val };
- void *SmallArray[SmallSizePowTwo];
+ enum { SmallSizePowTwo = RoundUpToPowerOfTwo<SmallSize>::Val };
+ /// SmallStorage - Fixed size storage used in 'small mode'. The extra element
+ /// ensures that the end iterator actually points to valid memory.
+ const void *SmallStorage[SmallSizePowTwo+1];
typedef PointerLikeTypeTraits<PtrType> PtrTraits;
public:
typedef PointerLikeTypeTraits<PtrType> PtrTraits;
public:
- SmallPtrSet() : SmallPtrSetImpl(
NextPowerOfTwo<SmallSizePowTwo>::Val
) {}
- SmallPtrSet(const SmallPtrSet &that) : SmallPtrSetImpl(that) {}
+ SmallPtrSet() : SmallPtrSetImpl(
SmallStorage, SmallSizePowTwo
) {}
+ SmallPtrSet(const SmallPtrSet &that) : SmallPtrSetImpl(
SmallStorage,
that) {}
template<typename It>
template<typename It>
- SmallPtrSet(It I, It E)
- : SmallPtrSetImpl(NextPowerOfTwo<SmallSizePowTwo>::Val) {
+ SmallPtrSet(It I, It E) : SmallPtrSetImpl(SmallStorage, SmallSizePowTwo) {
insert(I, E);
}
insert(I, E);
}
@@
-285,8
+289,20
@@
public:
return *this;
}
return *this;
}
+ /// swap - Swaps the elements of two sets.
+ void swap(SmallPtrSet<PtrType, SmallSize> &RHS) {
+ SmallPtrSetImpl::swap(RHS);
+ }
};
}
};
}
+namespace std {
+ /// Implement std::swap in terms of SmallPtrSet swap.
+ template<class T, unsigned N>
+ inline void swap(llvm::SmallPtrSet<T, N> &LHS, llvm::SmallPtrSet<T, N> &RHS) {
+ LHS.swap(RHS);
+ }
+}
+
#endif
#endif