Fix some problems with ASTCallbackVH in its use as a DenseMap key.

llvm-svn: 77696

1 files changed, 6 insertions, 4 deletions

diff --git a/llvm/lib/Analysis/AliasSetTracker.cpp b/llvm/lib/Analysis/AliasSetTracker.cpp
index 9f201c322df..760964c806b 100644
--- a/llvm/lib/Analysis/AliasSetTracker.cpp
+++ b/llvm/lib/Analysis/AliasSetTracker.cpp
@@ -586,10 +586,12 @@ void AliasSetTracker::ASTCallbackVH::deleted() {
 }
 
 AliasSetTracker::ASTCallbackVH::ASTCallbackVH(Value *V, AliasSetTracker *ast)
-  : CallbackVH(V == DenseMapInfo<Value *>::getEmptyKey() ? 0 :
-               V == DenseMapInfo<Value *>::getTombstoneKey() ? 0 :
-               V),
-    AST(ast) {}
+  : CallbackVH(V), AST(ast) {}
+
+AliasSetTracker::ASTCallbackVH &
+AliasSetTracker::ASTCallbackVH::operator=(Value *V) {
+  return *this = ASTCallbackVH(V, AST);
+}
 
 //===----------------------------------------------------------------------===//
 //                            AliasSetPrinter Pass