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

Fix problems where DenseMap used operator!= instead of correctly 

calling the traits implementation of isEqual.

llvm-svn: 42782
This commit is contained in:
Chris Lattner 2007-10-09 05:42:12 +00:00
parent 5c50f59690
commit 38d49f5d90
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,8 @@ public:
~DenseMap() { ~DenseMap() {
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 (P->first != EmptyKey && P->first != TombstoneKey) if (!KeyInfoT::isEqual(P->first, EmptyKey) &&
!KeyInfoT::isEqual(P->first, TombstoneKey))
P->second.~ValueT(); P->second.~ValueT();
P->first.~KeyT(); P->first.~KeyT();
} }
@ -113,8 +114,8 @@ public:
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 (P->first != EmptyKey) { if (!KeyInfoT::isEqual(P->first, EmptyKey)) {
if (P->first != TombstoneKey) { if (!KeyInfoT::isEqual(P->first, TombstoneKey)) {
P->second.~ValueT(); P->second.~ValueT();
--NumEntries; --NumEntries;
} }
@ -192,7 +193,8 @@ private:
if (NumBuckets != 0 && (!KeyInfoT::isPod() || !ValueInfoT::isPod())) { if (NumBuckets != 0 && (!KeyInfoT::isPod() || !ValueInfoT::isPod())) {
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 (P->first != EmptyKey && P->first != TombstoneKey) if (!KeyInfoT::isEqual(P->first, EmptyKey) &&
!KeyInfoT::isEqual(P->first, TombstoneKey))
P->second.~ValueT(); P->second.~ValueT();
P->first.~KeyT(); P->first.~KeyT();
} }
@ -211,8 +213,8 @@ private:
else else
for (size_t i = 0; i < other.NumBuckets; ++i) { for (size_t i = 0; i < other.NumBuckets; ++i) {
new (Buckets[i].first) KeyT(other.Buckets[i].first); new (Buckets[i].first) KeyT(other.Buckets[i].first);
if (Buckets[i].first != getEmptyKey() && if (!KeyInfoT::isEqual(Buckets[i].first, getEmptyKey()) &&
Buckets[i].first != getTombstoneKey()) !KeyInfoT::isEqual(Buckets[i].first, getTombstoneKey()))
new (&Buckets[i].second) ValueT(other.Buckets[i].second); new (&Buckets[i].second) ValueT(other.Buckets[i].second);
} }
NumBuckets = other.NumBuckets; NumBuckets = other.NumBuckets;
@ -237,7 +239,7 @@ private:
++NumEntries; ++NumEntries;
// If we are writing over a tombstone, remember this. // If we are writing over a tombstone, remember this.
if (TheBucket->first != getEmptyKey()) if (!KeyInfoT::isEqual(TheBucket->first, getEmptyKey()))
--NumTombstones; --NumTombstones;
TheBucket->first = Key; TheBucket->first = Key;
@ -268,7 +270,8 @@ private:
BucketT *FoundTombstone = 0; BucketT *FoundTombstone = 0;
const KeyT EmptyKey = getEmptyKey(); const KeyT EmptyKey = getEmptyKey();
const KeyT TombstoneKey = getTombstoneKey(); const KeyT TombstoneKey = getTombstoneKey();
assert(Val != EmptyKey && Val != TombstoneKey && assert(!KeyInfoT::isEqual(Val, EmptyKey) &&
!KeyInfoT::isEqual(Val, TombstoneKey) &&
"Empty/Tombstone value shouldn't be inserted into map!"); "Empty/Tombstone value shouldn't be inserted into map!");
while (1) { while (1) {
@ -331,7 +334,8 @@ private:
// Insert all the old elements. // Insert all the old elements.
const KeyT TombstoneKey = getTombstoneKey(); const KeyT TombstoneKey = getTombstoneKey();
for (BucketT *B = OldBuckets, *E = OldBuckets+OldNumBuckets; B != E; ++B) { for (BucketT *B = OldBuckets, *E = OldBuckets+OldNumBuckets; B != E; ++B) {
if (B->first != EmptyKey && B->first != TombstoneKey) { if (!KeyInfoT::isEqual(B->first, EmptyKey) &&
!KeyInfoT::isEqual(B->first, TombstoneKey)) {
// Insert the key/value into the new table. // Insert the key/value into the new table.
BucketT *DestBucket; BucketT *DestBucket;
bool FoundVal = LookupBucketFor(B->first, DestBucket); bool FoundVal = LookupBucketFor(B->first, DestBucket);
@ -368,7 +372,8 @@ private:
// Free the old buckets. // Free the old buckets.
const KeyT TombstoneKey = getTombstoneKey(); const KeyT TombstoneKey = getTombstoneKey();
for (BucketT *B = OldBuckets, *E = OldBuckets+OldNumBuckets; B != E; ++B) { for (BucketT *B = OldBuckets, *E = OldBuckets+OldNumBuckets; B != E; ++B) {
if (B->first != EmptyKey && B->first != TombstoneKey) { if (!KeyInfoT::isEqual(B->first, EmptyKey) &&
!KeyInfoT::isEqual(B->first, TombstoneKey)) {
// Free the value. // Free the value.
B->second.~ValueT(); B->second.~ValueT();
} }