diff options
| -rw-r--r-- | lib/Sema/SemaTemplate.cpp | 25 | ||||
| -rw-r--r-- | test/SemaTemplate/class-template-decl.cpp | 43 |
2 files changed, 65 insertions, 3 deletions
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index e16e7d67c6..f1581e0c34 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -865,9 +865,13 @@ Sema::CheckClassTemplate(Scope *S, unsigned TagSpec, TagUseKind TUK, return true; } - // Find any previous declaration with this name. + // Find any previous declaration with this name. For a friend with no + // scope explicitly specified, we only look for tag declarations (per + // C++11 [basic.lookup.elab]p2). DeclContext *SemanticContext; - LookupResult Previous(*this, Name, NameLoc, LookupTagName, + LookupResult Previous(*this, Name, NameLoc, + (SS.isEmpty() && TUK == TUK_Friend) + ? LookupTagName : LookupOrdinaryName, ForRedeclaration); if (SS.isNotEmpty() && !SS.isInvalid()) { SemanticContext = computeDeclContext(SS, true); @@ -893,7 +897,7 @@ Sema::CheckClassTemplate(Scope *S, unsigned TagSpec, TagUseKind TUK, Invalid = true; } else if (TUK != TUK_Friend && TUK != TUK_Reference) diagnoseQualifiedDeclaration(SS, SemanticContext, Name, NameLoc); - + LookupQualifiedName(Previous, SemanticContext); } else { SemanticContext = CurContext; @@ -948,6 +952,21 @@ Sema::CheckClassTemplate(Scope *S, unsigned TagSpec, TagUseKind TUK, // declaration. PrevDecl = PrevClassTemplate = 0; SemanticContext = OutermostContext; + + // Check that the chosen semantic context doesn't already contain a + // declaration of this name as a non-tag type. + LookupResult Previous(*this, Name, NameLoc, LookupOrdinaryName, + ForRedeclaration); + DeclContext *LookupContext = SemanticContext; + while (LookupContext->isTransparentContext()) + LookupContext = LookupContext->getLookupParent(); + LookupQualifiedName(Previous, LookupContext); + + if (Previous.isAmbiguous()) + return true; + + if (Previous.begin() != Previous.end()) + PrevDecl = (*Previous.begin())->getUnderlyingDecl(); } } diff --git a/test/SemaTemplate/class-template-decl.cpp b/test/SemaTemplate/class-template-decl.cpp index bd2accee3c..23385a701e 100644 --- a/test/SemaTemplate/class-template-decl.cpp +++ b/test/SemaTemplate/class-template-decl.cpp @@ -94,3 +94,46 @@ namespace rdar9676205 { }; }; } + +namespace redecl { + int A; // expected-note {{here}} + template<typename T> struct A; // expected-error {{different kind of symbol}} + + int B; + template<typename T> struct B { // expected-error {{different kind of symbol}} + }; + + template<typename T> struct F; + template<typename T> struct K; + + int G, H; + + struct S { + int C; // expected-note {{here}} + template<typename T> struct C; // expected-error {{different kind of symbol}} + + int D; + template<typename T> struct D { // expected-error {{different kind of symbol}} + }; + + int E; + template<typename T> friend struct E { // expected-error {{cannot define a type in a friend}} + }; + + int F; + template<typename T> friend struct F; // ok, redecl::F + + template<typename T> struct G; // ok + + template<typename T> friend struct H; // expected-error {{different kind of symbol}} + + int I, J, K; + + struct U { + template<typename T> struct I; // ok + template<typename T> struct J { // ok + }; + template<typename T> friend struct K; // ok, redecl::K + }; + }; +} |