Use the canonical template decl when trying to find if it has a visibility

attribute.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160139 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 33826cbb46..2066a98984 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -702,8 +702,10 @@ llvm::Optional<Visibility> NamedDecl::getExplicitVisibility() const {
   // specialization of a class template, check for visibility
   // on the pattern.
   if (const ClassTemplateSpecializationDecl *spec
-        = dyn_cast<ClassTemplateSpecializationDecl>(this))
-    return getVisibilityOf(spec->getSpecializedTemplate()->getTemplatedDecl());
+      = dyn_cast<ClassTemplateSpecializationDecl>(this)) {
+    ClassTemplateDecl *TD = spec->getSpecializedTemplate()->getCanonicalDecl();
+    return getVisibilityOf(TD->getTemplatedDecl());
+  }
 
   // If this is a member class of a specialization of a class template
   // and the corresponding decl has explicit visibility, use that.