From: Ted Kremenek <kremenek@apple.com>
Date: Mon, 21 Jan 2008 22:54:46 +0000 (+0000)
Subject: Fixed buggy caching of the hash value of an ImutAVLTree node.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3387060470e25e6917adcdde3baa41e959172e90;p=oota-llvm.git

Fixed buggy caching of the hash value of an ImutAVLTree node.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@46229 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/ADT/ImmutableSet.h b/include/llvm/ADT/ImmutableSet.h
index 11724603647..9f08b038fc6 100644
--- a/include/llvm/ADT/ImmutableSet.h
+++ b/include/llvm/ADT/ImmutableSet.h
@@ -231,9 +231,12 @@ private:
   }
   
   inline unsigned ComputeHash() {
-    if (!isMutable() && Hash) return Hash;
-    Hash = ComputeHash(getSafeLeft(), getRight(), getValue());
-    return Hash;
+    if (Hash) return Hash;
+    
+    unsigned X = ComputeHash(getSafeLeft(), getRight(), getValue());
+    if (!isMutable()) Hash = X;
+    
+    return X;
   }    
   
   /// Profile - Generates a FoldingSet profile for a tree node before it is