r303650 - [index] The references to member enums from template instantiations should

[Alex Lorenz via cfe-commits]

Author: arphaman
Date: Tue May 23 11:35:50 2017
New Revision: 303650

URL: http://llvm.org/viewvc/llvm-project?rev=303650&view=rev
Log:
[index] The references to member enums from template instantiations should
refer to the pattern member enum in the base template

rdar://32325459

Modified:
    cfe/trunk/lib/Index/IndexingContext.cpp
    cfe/trunk/test/Index/Core/index-instantiated-source.cpp

Modified: cfe/trunk/lib/Index/IndexingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/IndexingContext.cpp?rev=303650&r1=303649&r2=303650&view=diff
==============================================================================
--- cfe/trunk/lib/Index/IndexingContext.cpp (original)
+++ cfe/trunk/lib/Index/IndexingContext.cpp Tue May 23 11:35:50 2017
@@ -127,6 +127,9 @@ bool IndexingContext::isTemplateImplicit
   } else if (const auto *RD = dyn_cast<CXXRecordDecl>(D)) {
     if (RD->getInstantiatedFromMemberClass())
       TKind = RD->getTemplateSpecializationKind();
+  } else if (const auto *ED = dyn_cast<EnumDecl>(D)) {
+    if (ED->getInstantiatedFromMemberEnum())
+      TKind = ED->getTemplateSpecializationKind();
   } else if (isa<FieldDecl>(D) || isa<TypedefNameDecl>(D)) {
     if (const auto *Parent = dyn_cast<Decl>(D->getDeclContext()))
       return isTemplateImplicitInstantiation(Parent);
@@ -177,6 +180,8 @@ static const Decl *adjustTemplateImplici
     return VD->getTemplateInstantiationPattern();
   } else if (const auto *RD = dyn_cast<CXXRecordDecl>(D)) {
     return RD->getInstantiatedFromMemberClass();
+  } else if (const auto *ED = dyn_cast<EnumDecl>(D)) {
+    return ED->getInstantiatedFromMemberEnum();
   } else if (isa<FieldDecl>(D) || isa<TypedefNameDecl>(D)) {
     const auto *ND = cast<NamedDecl>(D);
     if (const CXXRecordDecl *Pattern =

Modified: cfe/trunk/test/Index/Core/index-instantiated-source.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/Core/index-instantiated-source.cpp?rev=303650&r1=303649&r2=303650&view=diff
==============================================================================
--- cfe/trunk/test/Index/Core/index-instantiated-source.cpp (original)
+++ cfe/trunk/test/Index/Core/index-instantiated-source.cpp Tue May 23 11:35:50 2017
@@ -42,6 +42,11 @@ public:
 
     typedef int Typedef;
 // CHECK: [[@LINE-1]]:17 | type-alias/C | Typedef | c:{{.*}}index-instantiated-source.cpp at ST>2#T#T at TemplateClass@S at NestedType@T at Typedef |
+
+    enum Enum {
+// CHECK: [[@LINE-1]]:10 | enum/C | Enum | c:@ST>2#T#T at TemplateClass@S at NestedType@E at Enum |
+      EnumCase
+    };
   };
 };
 
@@ -74,4 +79,7 @@ void canonicalizeInstaniationReferences(
 // CHECK: [[@LINE-1]]:19 | type-alias/C++ | TypeAlias | c:@ST>2#T#T at TemplateClass@S at NestedType@TypeAlias |
   TT::NestedType::Typedef nestedTypedef;
 // CHECK: [[@LINE-1]]:19 | type-alias/C | Typedef | c:{{.*}}index-instantiated-source.cpp at ST>2#T#T at TemplateClass@S at NestedType@T at Typedef |
+
+  TT::NestedType::Enum nestedEnum;
+// CHECK: [[@LINE-1]]:19 | enum/C | Enum | c:@ST>2#T#T at TemplateClass@S at NestedType@E at Enum |
 }