Parse constructor names in friend declarations. Part of the fix for

PR6207.



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

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 171bee66ca..005311f075 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -3188,6 +3188,10 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC,
     if (CheckMemberSpecialization(NewFD, Previous))
       NewFD->setInvalidDecl();
   }
+
+  // Make sure this is set before checking the function declaration.
+  // We'll override the visibility type later.
+  if (isFriend) NewFD->setObjectOfFriendDecl(false);
     
   // Perform semantic checking on the function declaration.
   bool OverloadableAttrRequired = false; // FIXME: HACK!
@@ -3199,7 +3203,10 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC,
          "previous declaration set still overloaded");
 
   if (isFriend && Redeclaration) {
-    AccessSpecifier Access = NewFD->getPreviousDeclaration()->getAccess();
+    AccessSpecifier Access = AS_public;
+    if (!NewFD->isInvalidDecl())
+      Access = NewFD->getPreviousDeclaration()->getAccess();
+
     if (FunctionTemplate) {
       FunctionTemplate->setObjectOfFriendDecl(true);
       FunctionTemplate->setAccess(Access);