Keep only canonical Decls in Entities.

llvm-svn: 76532

2 files changed, 3 insertions, 1 deletions

diff --git a/clang/include/clang/Index/Entity.h b/clang/include/clang/Index/Entity.h
index 9a5b126d112..8eb72e61359 100644
--- a/clang/include/clang/Index/Entity.h
+++ b/clang/include/clang/Index/Entity.h
@@ -47,7 +47,7 @@ class Entity {
   /// translation unit, otherwise it stores the associated EntityImpl.
   llvm::PointerUnion<Decl *, EntityImpl *> Val;
 
-  explicit Entity(Decl *D) : Val(D) { }
+  explicit Entity(Decl *D);
   explicit Entity(EntityImpl *impl) : Val(impl) { }
   friend class EntityGetter;
   
diff --git a/clang/lib/Index/Entity.cpp b/clang/lib/Index/Entity.cpp
index feed3e4c807..cc45e25cc76 100644
--- a/clang/lib/Index/Entity.cpp
+++ b/clang/lib/Index/Entity.cpp
@@ -138,6 +138,8 @@ Entity EntityImpl::get(Decl *D, ProgramImpl &Prog) {
 // Entity Implementation
 //===----------------------------------------------------------------------===//
 
+Entity::Entity(Decl *D) : Val(D->getCanonicalDecl()) { }
+
 /// \brief Find the Decl that can be referred to by this entity.
 Decl *Entity::getDecl(ASTContext &AST) {
   if (isInvalid())