aboutsummaryrefslogtreecommitdiff
path: root/lib/Sema/SemaTemplate.cpp
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2010-03-02 23:09:38 +0000
committerJohn McCall <rjmccall@apple.com>2010-03-02 23:09:38 +0000
commite97c32f9578861d575ca96bbbae426c76cbc9024 (patch)
tree3c81be5c5f7a59942ec6a27c937be5a03b9757ab /lib/Sema/SemaTemplate.cpp
parent5ba290a12fb9390a77ea4dca3d98deb53022d182 (diff)
Suppress implicit member redeclarations arising from explicit instantiation
declarations after the member has been explicitly specialized. We already did this after explicit instantiation definitions; not doing it for declarations meant that subsequent definitions would see a previous member declaration with specialization kind "explicit instantiation decl", which would then happily get overridden. Fixes PR 6458. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@97605 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplate.cpp')
-rw-r--r--lib/Sema/SemaTemplate.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index c10b12b2da..03219580f9 100644
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -3790,6 +3790,7 @@ Sema::CheckSpecializationInstantiationRedecl(SourceLocation NewLoc,
// of a template appears after a declaration of an explicit
// specialization for that template, the explicit instantiation has no
// effect.
+ SuppressNew = true;
return false;
case TSK_ExplicitInstantiationDefinition: