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

Make sure ImmutableSet never inserts Tombstone/Entry into DenseMap. 

ImmutAVLTree uses random unsigned values as keys into a DenseMap,
which could possibly happen to be the same value as the Tombstone or
Entry keys in the DenseMap.

Test case is hard to come up with. We randomly get failures on the
internal static analyzer bot, which most likely hits this issue
(hard to be 100% sure without the full stack).

llvm-svn: 153148
This commit is contained in:
Anna Zaks 2012-03-20 22:56:27 +00:00
parent eba3a66055
commit a3b666ac4a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/include/llvm/ADT/ImmutableSet.h
View File

@ -347,7 +347,7 @@ public:
if (prev) if (prev)
prev->next = next; prev->next = next;
else else
factory->Cache[computeDigest()] = next; factory->Cache[factory->maskCacheIndex(computeDigest())] = next;
} }
// We need to clear the mutability bit in case we are // We need to clear the mutability bit in case we are
@ -429,6 +429,11 @@ protected:
TreeTy* getRight(TreeTy* T) const { return T->getRight(); } TreeTy* getRight(TreeTy* T) const { return T->getRight(); }
value_type_ref getValue(TreeTy* T) const { return T->value; } value_type_ref getValue(TreeTy* T) const { return T->value; }
// Make sure the index is not the Tombstone or Entry key of the DenseMap.
static inline unsigned maskCacheIndex(unsigned I) {
return (I & ~0x02);
}
unsigned incrementHeight(TreeTy* L, TreeTy* R) const { unsigned incrementHeight(TreeTy* L, TreeTy* R) const {
unsigned hl = getHeight(L); unsigned hl = getHeight(L);
unsigned hr = getHeight(R); unsigned hr = getHeight(R);
@ -611,7 +616,7 @@ public:
// Search the hashtable for another tree with the same digest, and // Search the hashtable for another tree with the same digest, and
// if find a collision compare those trees by their contents. // if find a collision compare those trees by their contents.
unsigned digest = TNew->computeDigest(); unsigned digest = TNew->computeDigest();
TreeTy *&entry = Cache[digest]; TreeTy *&entry = Cache[maskCacheIndex(digest)];
do { do {
if (!entry) if (!entry)
break; break;