Put function templates instantiated from friend declarations in the correct
lexical context. This is required for ADL to work properly; fixes PR6716.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@99665 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index e795f0a..59c9819 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -840,16 +840,18 @@
assert(InstTemplate &&
"VisitFunctionDecl/CXXMethodDecl didn't create a template!");
+ bool isFriend = (InstTemplate->getFriendObjectKind() != Decl::FOK_None);
+
// Link the instantiation back to the pattern *unless* this is a
// non-definition friend declaration.
if (!InstTemplate->getInstantiatedFromMemberTemplate() &&
- !(InstTemplate->getFriendObjectKind() &&
- !D->getTemplatedDecl()->isThisDeclarationADefinition()))
+ !(isFriend && !D->getTemplatedDecl()->isThisDeclarationADefinition()))
InstTemplate->setInstantiatedFromMemberTemplate(D);
- // Add non-friends into the owner.
- if (!InstTemplate->getFriendObjectKind())
+ // Make declarations visible in the appropriate context.
+ if (!isFriend)
Owner->addDecl(InstTemplate);
+
return InstTemplate;
}
@@ -973,7 +975,13 @@
if (Qualifier)
Function->setQualifierInfo(Qualifier, D->getQualifierRange());
- Function->setLexicalDeclContext(Owner);
+ DeclContext *LexicalDC = Owner;
+ if (!isFriend && D->isOutOfLine()) {
+ assert(D->getDeclContext()->isFileContext());
+ LexicalDC = D->getDeclContext();
+ }
+
+ Function->setLexicalDeclContext(LexicalDC);
// Attach the parameters
for (unsigned P = 0; P < Params.size(); ++P)
@@ -1000,7 +1008,8 @@
Function->getDeclName(),
TemplateParams, Function);
Function->setDescribedFunctionTemplate(FunctionTemplate);
- FunctionTemplate->setLexicalDeclContext(D->getLexicalDeclContext());
+
+ FunctionTemplate->setLexicalDeclContext(LexicalDC);
if (isFriend && D->isThisDeclarationADefinition()) {
// TODO: should we remember this connection regardless of whether