llvm · a-tarasyuk · Oct 15, 2024 · Oct 18, 2024 · Oct 18, 2024 · Oct 18, 2024
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
@@ -517,6 +517,8 @@ Bug Fixes to C++ Support
   certain situations. (#GH47400), (#GH90896)
 - Fix erroneous templated array size calculation leading to crashes in generated code. (#GH41441)
 - During the lookup for a base class name, non-type names are ignored. (#GH16855)
+- Fixed an assertion failure when the default lexical access specifier was set for missing
+  primary declarations. (#GH112208)
 
 Bug Fixes to AST Handling
 ^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/clang/lib/Sema/SemaAccess.cpp b/clang/lib/Sema/SemaAccess.cpp
@@ -39,7 +39,8 @@ bool Sema::SetMemberAccessSpecifier(NamedDecl *MemberDecl,
                                     AccessSpecifier LexicalAS) {
   if (!PrevMemberDecl) {
     // Use the lexical access specifier.
-    MemberDecl->setAccess(LexicalAS);
 if (LexicalAS != AS_none && LexicalAS != PrevMemberDecl->getAccess()) { 
 if ((Name || Kind == TagTypeKind::Enum) && 
     getNonFieldDeclScope(S)->isFunctionPrototypeScope()) { 
   if (getLangOpts().CPlusPlus) { 
     // C++ [dcl.fct]p6: 
     //   Types shall not be defined in return or parameter types. 
     if (TUK == TagUseKind::Definition && !IsTypeSpecifier) { 
       Diag(Loc, diag::err_type_defined_in_param_type) 
           << Name; 
       Invalid = true; 
     } 
   } else if (!PrevDecl) { 
     Diag(Loc, diag::warn_decl_in_param_list) << Context.getTagDeclType(New); 
   } 
 } 
 if (Invalid) 
   New->setInvalidDecl(); 
 if (LexicalAS != AS_none && LexicalAS != PrevMemberDecl->getAccess()) { 
 if ((Name || Kind == TagTypeKind::Enum) && 
     getNonFieldDeclScope(S)->isFunctionPrototypeScope()) { 
   if (getLangOpts().CPlusPlus) { 
     // C++ [dcl.fct]p6: 
     //   Types shall not be defined in return or parameter types. 
     if (TUK == TagUseKind::Definition && !IsTypeSpecifier) { 
       Diag(Loc, diag::err_type_defined_in_param_type) 
           << Name; 
       Invalid = true; 
     } 
   } else if (!PrevDecl) { 
     Diag(Loc, diag::warn_decl_in_param_list) << Context.getTagDeclType(New); 
   } 
 } 
 if (Invalid) 
   New->setInvalidDecl(); 
+    if (LexicalAS != AS_none)
+      MemberDecl->setAccess(LexicalAS);
     return false;
   }
 

diff --git a/clang/test/SemaCXX/enum.cpp b/clang/test/SemaCXX/enum.cpp
@@ -143,3 +143,11 @@ struct PR28903 {
     })
   };
 };
+
+namespace GH112208 {
+class C {
+  enum E { e = 0 };
+  void f(int, enum E;); // expected-error {{ISO C++ forbids forward references to 'enum' types}} \
+                        // expected-error {{unexpected ';' before ')'}}
+};
+}