commit edf99fff49803bbab663f0e1245f304123813b70
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 1af51bbf191bc6907f84d0eaa3ede086d3d42691
parent 8c8486dbb20183f3e91fce1e9aabaf214d31a6da

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

llvm-svn: 145146

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index c20033b..9477192 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/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) {