commit 4c51548271d2f8385127e1d943764ae8939d7794
author Abramo Bagnara <abramo.bagnara@gmail.com> Sat Nov 26 13:33:46 2011 +0000
committer Abramo Bagnara <abramo.bagnara@gmail.com> Sat Nov 26 13:33:46 2011 +0000
tree 2d5743c9ff2b699ae8cce4c20bc6d5a6f7121b00
parent 4c7ce36a761b65a659aa6c4728a318e5d06f5f95

Fixed lexical declaration context when instantiating a friend / out-of-line class template member.

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

lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index c20033b..9477192 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -862,9 +862,16 @@
   // Finish handling of friends.
   if (isFriend) {
     DC->makeDeclVisibleInContext(Inst, /*Recoverable*/ false);
+    Inst->setLexicalDeclContext(Owner);
+    RecordInst->setLexicalDeclContext(Owner);
     return Inst;
   }
 
+  if (D->isOutOfLine()) {
+    Inst->setLexicalDeclContext(D->getLexicalDeclContext());
+    RecordInst->setLexicalDeclContext(D->getLexicalDeclContext());
+  }
+
   Owner->addDecl(Inst);
 
   if (!PrevClassTemplate) {