commit 8809a0c95e7aa9e858f455bbb9a3f5a3c4ae96d3
author Richard Smith <richard-llvm@metafoo.co.uk> Fri Sep 27 20:14:12 2013 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Fri Sep 27 20:14:12 2013 +0000
tree 0902cddbb5d01a0a7cde1d63bbc6827b7a67ab6d
parent 23e43cdda610f04bfaec7d43958a1b1a8904113f

Variable templates: handle instantiation of static data member templates
appropriately, especially when they appear within class templates.

llvm-svn: 191548

clang/lib/Sema/SemaTemplateInstantiate.cpp

diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp
index d85f7e4..32111ba 100644
--- a/clang/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp
@@ -2471,6 +2471,9 @@
         }
       }
     } else if (VarDecl *Var = dyn_cast<VarDecl>(*D)) {
+      if (isa<VarTemplateSpecializationDecl>(Var))
+        continue;
+
       if (Var->isStaticDataMember()) {
         MemberSpecializationInfo *MSInfo = Var->getMemberSpecializationInfo();
         assert(MSInfo && "No member specialization information?");