commit d0629eb137d06bf6d46a430abdb7fa044909298b
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 c2dcbbfb24cf758d54fa53f56e1174bee4661b18
parent 2096fd6918bd19aabcbf19ddc8dcd0b94f4274af

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

lib/Sema/SemaDecl.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 62f65a5..ccfbeeb 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -8338,7 +8338,8 @@
     if (VDecl->getStorageClass() == SC_Extern &&
         (!getLangOpts().CPlusPlus ||
          !(Context.getBaseElementType(VDecl->getType()).isConstQualified() ||
-           VDecl->isExternC())))
+           VDecl->isExternC())) &&
+        !isTemplateInstantiation(VDecl->getTemplateSpecializationKind()))
       Diag(VDecl->getLocation(), diag::warn_extern_init);
 
     // C99 6.7.8p4. All file scoped initializers need to be constant.