commit 4a91989b2dc901a4998fa5443aeba0276a8cfaa6
author Larisse Voufo <lvoufo@google.com> Wed Aug 14 03:09:19 2013 +0000
committer Larisse Voufo <lvoufo@google.com> Wed Aug 14 03:09:19 2013 +0000
tree 51e02c9645c6be89d5208cb9ed845cc8ee0aa850
parent 2388b77626beea9fb8a57fbca35b605764d911b2

Bug fix: disallow a variable template to be redeclared as a non-templated variable

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

lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index c7242aa..3379ebc 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -3365,7 +3365,7 @@
              OldVar->hasLinkage())
     LookupQualifiedName(Previous, NewVar->getDeclContext(), false);
 
-  CheckVariableDeclaration(NewVar, Previous);
+  CheckVariableDeclaration(NewVar, Previous, ForVarTemplate);
 
   if (OldVar->isOutOfLine()) {
     OldVar->getLexicalDeclContext()->addDecl(NewVar);