Bug fix: disallow a variable template to be redeclared as a non-templated variable
llvm-svn: 188350
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index bc46aae..c583674 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -2920,15 +2920,21 @@
/// definitions here, since the initializer hasn't been attached.
///
void Sema::MergeVarDecl(VarDecl *New, LookupResult &Previous,
- bool MergeTypeWithPrevious) {
+ bool IsVariableTemplate, bool MergeTypeWithPrevious) {
// If the new decl is already invalid, don't do any other checking.
if (New->isInvalidDecl())
return;
- // Verify the old decl was also a variable.
+ // Verify the old decl was also a variable or variable template.
VarDecl *Old = 0;
- if (!Previous.isSingleResult() ||
- !(Old = dyn_cast<VarDecl>(Previous.getFoundDecl()))) {
+ if (Previous.isSingleResult() &&
+ (Old = dyn_cast<VarDecl>(Previous.getFoundDecl()))) {
+ if (IsVariableTemplate)
+ Old = Old->getDescribedVarTemplate() ? Old : 0;
+ else
+ Old = Old->getDescribedVarTemplate() ? 0 : Old;
+ }
+ if (!Old) {
Diag(New->getLocation(), diag::err_redefinition_different_kind)
<< New->getDeclName();
Diag(Previous.getRepresentativeDecl()->getLocation(),
@@ -4919,6 +4925,7 @@
bool IsExplicitSpecialization = false;
bool IsVariableTemplateSpecialization = false;
bool IsPartialSpecialization = false;
+ bool IsVariableTemplate = false;
bool Invalid = false; // TODO: Can we remove this (error-prone)?
TemplateParameterList *TemplateParams = 0;
VarTemplateDecl *PrevVarTemplate = 0;
@@ -5019,6 +5026,7 @@
} else { // if (TemplateParams->size() > 0)
// This is a template declaration.
+ IsVariableTemplate = true;
// Check that we can declare a template here.
if (CheckTemplateDeclScope(S, TemplateParams))
@@ -5310,9 +5318,11 @@
LookupResult PrevDecl(*this, GetNameForDeclarator(D),
LookupOrdinaryName, ForRedeclaration);
PrevDecl.addDecl(PrevVarTemplate->getTemplatedDecl());
- D.setRedeclaration(CheckVariableDeclaration(NewVD, PrevDecl));
+ D.setRedeclaration(
+ CheckVariableDeclaration(NewVD, PrevDecl, IsVariableTemplate));
} else
- D.setRedeclaration(CheckVariableDeclaration(NewVD, Previous));
+ D.setRedeclaration(
+ CheckVariableDeclaration(NewVD, Previous, IsVariableTemplate));
}
// This is an explicit specialization of a static data member. Check it.
@@ -5340,8 +5350,8 @@
}
}
- // If this is not a variable template, return it now
- if (!TemplateParams || IsVariableTemplateSpecialization)
+ // If this is not a variable template, return it now.
+ if (!IsVariableTemplate)
return NewVD;
// If this is supposed to be a variable template, create it as such.
@@ -5745,7 +5755,8 @@
///
/// Returns true if the variable declaration is a redeclaration.
bool Sema::CheckVariableDeclaration(VarDecl *NewVD,
- LookupResult &Previous) {
+ LookupResult &Previous,
+ bool IsVariableTemplate) {
CheckVariableDeclarationType(NewVD);
// If the decl is already known invalid, don't check it.
@@ -5795,7 +5806,7 @@
filterNonConflictingPreviousDecls(Context, NewVD, Previous);
if (!Previous.empty()) {
- MergeVarDecl(NewVD, Previous, MergeTypeWithPrevious);
+ MergeVarDecl(NewVD, Previous, IsVariableTemplate, MergeTypeWithPrevious);
return true;
}
return false;
diff --git a/clang/lib/Sema/SemaTemplate.cpp b/clang/lib/Sema/SemaTemplate.cpp
index bd2936b..c8298a9 100644
--- a/clang/lib/Sema/SemaTemplate.cpp
+++ b/clang/lib/Sema/SemaTemplate.cpp
@@ -2280,32 +2280,6 @@
bool IsPartialSpecialization);
static TemplateSpecializationKind getTemplateSpecializationKind(Decl *D);
-/*
-// Check the new variable specialization against the parsed input.
-//
-// FIXME: Model this against function specializations where
-// a new function declaration is checked against the specialization
-// as candidate for redefinition... (?)
-static bool CheckVariableTemplateSpecializationType() {
-
- if (ExpectedType is undeduced && ParsedType is not undeduced)
- ExpectedType = dedudeType();
-
- if (both types are undeduced)
- ???;
-
- bool CheckType = !ExpectedType()->
-
- if (!Context.hasSameType(DI->getType(), ExpectedDI->getType())) {
- unsigned ErrStr = IsPartialSpecialization ? 2 : 1;
- Diag(D.getIdentifierLoc(), diag::err_invalid_var_template_spec_type)
- << ErrStr << VarTemplate << DI->getType() << ExpectedDI->getType();
- Diag(VarTemplate->getLocation(), diag::note_template_declared_here)
- << 2 << VarTemplate->getDeclName();
- return true;
- }
-}
-*/
DeclResult Sema::ActOnVarTemplateSpecialization(
Scope *S, VarTemplateDecl *VarTemplate, Declarator &D, TypeSourceInfo *DI,
@@ -2359,13 +2333,6 @@
if (!ExpectedDI)
return true;
- /*
- // Check the new variable specialization against the parsed input.
- // (Attributes are merged later below.)
- if (CheckVariableTemplateSpecializationType())
- return true;
- */
-
// Find the variable template (partial) specialization declaration that
// corresponds to these arguments.
if (IsPartialSpecialization) {
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index c7242aa..3379ebc 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/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);