6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-03-01 01:30:36 +00:00
Code Issues Projects Releases Wiki Activity

DenseMap: Factor destruction into a common helper method.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@157538 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer 2012-05-27 17:38:18 +00:00
parent b4654c1c49
commit 295d8ff007
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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