1 files changed, 9 insertions, 1 deletions
diff --git a/clang/lib/Index/IndexingContext.cpp b/clang/lib/Index/IndexingContext.cpp
index 2f54667e85e..754bc84ff4b 100644
--- a/clang/lib/Index/IndexingContext.cpp
+++ b/clang/lib/Index/IndexingContext.cpp
@@ -130,7 +130,8 @@ bool IndexingContext::isTemplateImplicitInstantiation(const Decl *D) {
   } else if (const auto *ED = dyn_cast<EnumDecl>(D)) {
     if (ED->getInstantiatedFromMemberEnum())
       TKind = ED->getTemplateSpecializationKind();
-  } else if (isa<FieldDecl>(D) || isa<TypedefNameDecl>(D)) {
+  } else if (isa<FieldDecl>(D) || isa<TypedefNameDecl>(D) ||
+             isa<EnumConstantDecl>(D)) {
     if (const auto *Parent = dyn_cast<Decl>(D->getDeclContext()))
       return isTemplateImplicitInstantiation(Parent);
   }
@@ -193,6 +194,13 @@ static const Decl *adjustTemplateImplicitInstantiation(const Decl *D) {
           return BaseND;
       }
     }
+  } else if (const auto *ECD = dyn_cast<EnumConstantDecl>(D)) {
+    if (const auto *ED = dyn_cast<EnumDecl>(ECD->getDeclContext())) {
+      if (const EnumDecl *Pattern = ED->getInstantiatedFromMemberEnum()) {
+        for (const NamedDecl *BaseECD : Pattern->lookup(ECD->getDeclName()))
+          return BaseECD;
+      }
+    }
   }
   return nullptr;
 }