From b1ce6ece84cd4dbb7a9950cdd96e54f0b863ac77 Mon Sep 17 00:00:00 2001
From: Alex Lorenz <arphaman@gmail.com>
Date: Tue, 23 May 2017 16:27:42 +0000
Subject: [PATCH] [index] The references to type aliases and typedefs from
 template instantiations should refer to the pattern type aliases / typedefs
 in the base templates

rdar://32325459


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@303648 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Index/IndexingContext.cpp                 | 15 ++++++++-------
 test/Index/Core/index-instantiated-source.cpp | 10 ++++++++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/lib/Index/IndexingContext.cpp b/lib/Index/IndexingContext.cpp
index 1a341b04c4..5b5270df99 100644
--- a/lib/Index/IndexingContext.cpp
+++ b/lib/Index/IndexingContext.cpp
@@ -127,7 +127,7 @@ bool IndexingContext::isTemplateImplicitInstantiation(const Decl *D) {
   } else if (const auto *RD = dyn_cast<CXXRecordDecl>(D)) {
     if (RD->getInstantiatedFromMemberClass())
       TKind = RD->getTemplateSpecializationKind();
-  } else if (isa<FieldDecl>(D)) {
+  } else if (isa<FieldDecl>(D) || isa<TypedefNameDecl>(D)) {
     if (const auto *Parent = dyn_cast<Decl>(D->getDeclContext()))
       return isTemplateImplicitInstantiation(Parent);
   }
@@ -177,14 +177,15 @@ static const Decl *adjustTemplateImplicitInstantiation(const Decl *D) {
     return VD->getTemplateInstantiationPattern();
   } else if (const auto *RD = dyn_cast<CXXRecordDecl>(D)) {
     return RD->getInstantiatedFromMemberClass();
-  } else if (const auto *FD = dyn_cast<FieldDecl>(D)) {
+  } else if (isa<FieldDecl>(D) || isa<TypedefNameDecl>(D)) {
+    const auto *ND = cast<NamedDecl>(D);
     if (const CXXRecordDecl *Pattern =
-            getDeclContextForTemplateInstationPattern(FD)) {
-      for (const NamedDecl *ND : Pattern->lookup(FD->getDeclName())) {
-        if (ND->isImplicit())
+            getDeclContextForTemplateInstationPattern(ND)) {
+      for (const NamedDecl *BaseND : Pattern->lookup(ND->getDeclName())) {
+        if (BaseND->isImplicit())
           continue;
-        if (isa<FieldDecl>(ND))
-          return ND;
+        if (BaseND->getKind() == ND->getKind())
+          return BaseND;
       }
     }
   }
diff --git a/test/Index/Core/index-instantiated-source.cpp b/test/Index/Core/index-instantiated-source.cpp
index b0c94195a1..5de9ab6a1b 100644
--- a/test/Index/Core/index-instantiated-source.cpp
+++ b/test/Index/Core/index-instantiated-source.cpp
@@ -37,6 +37,11 @@ public:
     public:
       SubNestedType(int);
     };
+    using TypeAlias = T;
+// CHECK: [[@LINE-1]]:11 | type-alias/C++ | TypeAlias | c:@ST>2#T#T@TemplateClass@S@NestedType@TypeAlias |
+
+    typedef int Typedef;
+// CHECK: [[@LINE-1]]:17 | type-alias/C | Typedef | c:{{.*}}index-instantiated-source.cpp@ST>2#T#T@TemplateClass@S@NestedType@T@Typedef |
   };
 };
 
@@ -64,4 +69,9 @@ void canonicalizeInstaniationReferences(TemplateClass<int, float> &object) {
   TT::NestedType::SubNestedType subNestedType(0);
 // CHECK: [[@LINE-1]]:7 | struct/C++ | NestedType | c:@ST>2#T#T@TemplateClass@S@NestedType |
 // CHECK: [[@LINE-2]]:19 | class/C++ | SubNestedType | c:@ST>2#T#T@TemplateClass@S@NestedType@S@SubNestedType |
+
+  TT::NestedType::TypeAlias nestedTypeAlias;
+// CHECK: [[@LINE-1]]:19 | type-alias/C++ | TypeAlias | c:@ST>2#T#T@TemplateClass@S@NestedType@TypeAlias |
+  TT::NestedType::Typedef nestedTypedef;
+// CHECK: [[@LINE-1]]:19 | type-alias/C | Typedef | c:{{.*}}index-instantiated-source.cpp@ST>2#T#T@TemplateClass@S@NestedType@T@Typedef |
 }
-- 
2.50.1