maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

DenseMap: Factor destruction into a common helper method. 

llvm-svn: 157538
This commit is contained in:
Benjamin Kramer 2012-05-27 17:38:18 +00:00
parent f021889036
commit fd91e72ee2
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
llvm/include/llvm/ADT/DenseMap.h
View File

@ -64,18 +64,7 @@ public:
}
~DenseMap() {
const KeyT EmptyKey = getEmptyKey(), TombstoneKey = getTombstoneKey();
for (BucketT *P = Buckets, *E = Buckets+NumBuckets; P != E; ++P) {
if (!KeyInfoT::isEqual(P->first, EmptyKey) &&
!KeyInfoT::isEqual(P->first, TombstoneKey))
P->second.~ValueT();
P->first.~KeyT();
}
#ifndef NDEBUG
if (NumBuckets)
memset((void*)Buckets, 0x5a, sizeof(BucketT)*NumBuckets);
#endif
operator delete(Buckets);
DestroyAll();
}
typedef DenseMapIterator<KeyT, ValueT, KeyInfoT> iterator;
@ -254,9 +243,7 @@ public:
const void *getPointerIntoBucketsArray() const { return Buckets; }
private:
void CopyFrom(const DenseMap& other) {
if (NumBuckets != 0 &&
(!isPodLike<KeyT>::value || !isPodLike<ValueT>::value)) {
void DestroyAll() {
const KeyT EmptyKey = getEmptyKey(), TombstoneKey = getTombstoneKey();
for (BucketT *P = Buckets, *E = Buckets+NumBuckets; P != E; ++P) {
if (!KeyInfoT::isEqual(P->first, EmptyKey) &&
@ -264,10 +251,6 @@ private:
P->second.~ValueT();
P->first.~KeyT();
}
}
NumEntries = other.NumEntries;
NumTombstones = other.NumTombstones;
if (NumBuckets) {
#ifndef NDEBUG
@ -275,7 +258,13 @@ private:
#endif
operator delete(Buckets);
}
}
void CopyFrom(const DenseMap& other) {
DestroyAll();
NumEntries = other.NumEntries;
NumTombstones = other.NumTombstones;
NumBuckets = other.NumBuckets;
if (NumBuckets == 0) {