commit ea7c7ce3586b1a1774fe41c53267bc7c5dfad6bf
author John McCall <rjmccall@apple.com> Mon Aug 31 22:39:49 2009 +0000
committer John McCall <rjmccall@apple.com> Mon Aug 31 22:39:49 2009 +0000
tree 5bac47b0d4ae5069f76775dd1cad78705add69c0
parent 2f0ceceade1d3dafd930b3238f573e2860c6e0fa

Fix bug 4784 and allow friend declarations to properly extend
existing declaration chains.



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

lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index aa116b2..c5b2894 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -498,7 +498,7 @@
     bool WasDeclared = (FOK == Decl::FOK_Declared);
     Function->setObjectOfFriendDecl(WasDeclared);
     if (!Owner->isDependentContext())
-      DC->makeDeclVisibleInContext(Function);
+      DC->makeDeclVisibleInContext(Function, /* Recoverable = */ false);
 
     Function->setInstantiationOfMemberFunction(D);
   }