Borrow a friend class's previous declaration's access specifier regardless of

whether the current context is dependent.

Thanks to Anders for pointing this out.

llvm-svn: 80828

2 files changed, 8 insertions, 5 deletions

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 113283a6446..e7a327805a0 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -4329,13 +4329,13 @@ CreateNewDecl:
   
   // If this has an identifier, add it to the scope stack.
   if (TUK == TUK_Friend) {
+    // We might be replacing an existing declaration in the lookup tables;
+    // if so, borrow its access specifier.
+    if (PrevDecl)
+      New->setAccess(PrevDecl->getAccess());
+
     // Friend tag decls are visible in fairly strange ways.
     if (!CurContext->isDependentContext()) {
-      // We might be replacing an existing declaration in the lookup tables;
-      // if so, borrow its access specifier.
-      if (PrevDecl)
-        New->setAccess(PrevDecl->getAccess());
-
       DeclContext *DC = New->getDeclContext()->getLookupContext();
       DC->makeDeclVisibleInContext(New, /* Recoverable = */ false);
       if (Scope *EnclosingScope = getScopeForDeclContext(S, DC))
diff --git a/clang/test/CXX/temp/temp.decls/temp.friend/p1.cpp b/clang/test/CXX/temp/temp.decls/temp.friend/p1.cpp
index 4434d483890..3777485e1ae 100644
--- a/clang/test/CXX/temp/temp.decls/temp.friend/p1.cpp
+++ b/clang/test/CXX/temp/temp.decls/temp.friend/p1.cpp
@@ -27,6 +27,9 @@ public:
     value_ += b.value_;
     return *this;
   }
+
+  class Representation {};
+  friend class Representation;
 };
 
 class A {