Set a member's access specifier even if it doesn't match the previous specifier.

Prevents an assert on successive redeclarations.

Fixed PR5573.

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

diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp
index 21f83a560d7c4b8792ac47219d2bc0ab9156eea5..b7cc37b6c9a76e0dfd839d2b8d1b20cce3f24370 100644 (file)
--- a/lib/Sema/SemaAccess.cpp
+++ b/lib/Sema/SemaAccess.cpp
@@ -37,6 +37,8 @@ bool Sema::SetMemberAccessSpecifier(NamedDecl *MemberDecl,
       << MemberDecl << LexicalAS;
     Diag(PrevMemberDecl->getLocation(), diag::note_previous_access_declaration)
       << PrevMemberDecl << PrevMemberDecl->getAccess();
+
+    MemberDecl->setAccess(LexicalAS);
     return true;
   }
 

diff --git a/test/SemaCXX/access.cpp b/test/SemaCXX/access.cpp
index ae2fef11f81fb12db8702cf46ee7ade360819537..6115ff6a94f405a2d55bcfb7172f9fb110cb81c5 100644 (file)
--- a/test/SemaCXX/access.cpp
+++ b/test/SemaCXX/access.cpp
@@ -21,3 +21,14 @@ protected:
 private:
     template<typename T> struct A {}; // expected-error {{'A' redeclared with 'private' access}}
 };
+
+// PR5573
+namespace test1 {
+  class A {
+  private:
+    class X; // expected-note {{previously declared 'private' here}}
+  public:
+    class X; // expected-error {{ 'X' redeclared with 'public' access}}
+    class X {};
+  };
+}