diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-09-27 20:14:12 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-09-27 20:14:12 +0000 |
| commit | d0629eb137d06bf6d46a430abdb7fa044909298b (patch) | |
| tree | c2dcbbfb24cf758d54fa53f56e1174bee4661b18 /lib/Sema/SemaTemplateInstantiate.cpp | |
| parent | 2096fd6918bd19aabcbf19ddc8dcd0b94f4274af (diff) | |
Variable templates: handle instantiation of static data member templates
appropriately, especially when they appear within class templates.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@191548 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplateInstantiate.cpp')
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiate.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp index d85f7e4b1b..32111bac3a 100644 --- a/lib/Sema/SemaTemplateInstantiate.cpp +++ b/lib/Sema/SemaTemplateInstantiate.cpp @@ -2471,6 +2471,9 @@ Sema::InstantiateClassMembers(SourceLocation PointOfInstantiation, } } } 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?"); |