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

Fix non-deterministic behavior in the DenseMap copy constructor. 

llvm-svn: 41831
This commit is contained in:
Owen Anderson 2007-09-11 03:48:08 +00:00
parent 2b6e98b89a
commit 4484d0d51a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,7 @@ public:
private:
void CopyFrom(const DenseMap& other) {
if (NumEntries != 0) {
if (NumBuckets != 0 && !KeyInfoT::isPod()) {
const KeyT EmptyKey = getEmptyKey(), TombstoneKey = getTombstoneKey();
for (BucketT *P = Buckets, *E = Buckets+NumBuckets; P != E; ++P) {
if (P->first != EmptyKey && P->first != TombstoneKey)
@ -197,8 +197,14 @@ private:
delete[] reinterpret_cast<char*>(Buckets);
Buckets = reinterpret_cast<BucketT*>(new char[sizeof(BucketT) *
other.NumBuckets]);
memcpy(Buckets, other.Buckets, other.NumBuckets * sizeof(BucketT));
if (KeyInfoT::isPod())
memcpy(Buckets, other.Buckets, other.NumBuckets * sizeof(BucketT));
else
for (size_t i = 0; i < other.NumBuckets; ++i) {
new (Buckets[i].first) KeyT(other.Buckets[i].first);
new (Buckets[i].second) ValueT(other.Buckets[i].second);
}
NumBuckets = other.NumBuckets;
}