Skip to content

[Clang][Sema] Check the return value of DiagnoseClassNameShadow in ActOnEnumConstant #143754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 16, 2025
Merged

[Clang][Sema] Check the return value of DiagnoseClassNameShadow in ActOnEnumConstant #143754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41e1b10
[Clang][Sema] Check the return value of DiagnoseClassNameShadow in Ac…
shafik Jun 11, 2025
66990b5
Adding test to confirm we don't create enumerator that shadows.
shafik Aug 15, 2025
c4738fc
Merge remote-tracking branch 'origin/main' into ActOnEnumConstantChec…
shafik Aug 15, 2025
5d88b17
Update test after merging w/ main.
shafik Aug 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions clang/lib/Sema/SemaDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20264,9 +20264,10 @@ Decl *Sema::ActOnEnumConstant(Scope *S, Decl *theEnumDecl, Decl *lastEnumConst,
// different from T:
// - every enumerator of every member of class T that is an unscoped
// enumerated type
if (getLangOpts().CPlusPlus && !TheEnumDecl->isScoped())
DiagnoseClassNameShadow(TheEnumDecl->getDeclContext(),
DeclarationNameInfo(Id, IdLoc));
if (getLangOpts().CPlusPlus && !TheEnumDecl->isScoped() &&
DiagnoseClassNameShadow(TheEnumDecl->getDeclContext(),
DeclarationNameInfo(Id, IdLoc)))
return nullptr;

EnumConstantDecl *New =
CheckEnumConstant(TheEnumDecl, LastEnumConst, IdLoc, Id, Val);
Expand Down
9 changes: 9 additions & 0 deletions clang/test/CXX/class/class.mem/p13.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,12 @@ template<typename B> struct CtorDtorName : B {
CtorDtorName();
~CtorDtorName(); // expected-error {{identifier 'CtorDtorName' after '~' in destructor name does not name a type}}
};

struct S { // expected-note {{'S' declared here}}
enum E {
R = 11,
S = 12 // expected-error {{member 'S' has the same name as its class}}
};
static_assert(E::R == 11, "E::R is not 11");
static_assert(E::S == 12, "E::S is not 12"); // expected-error {{no member named 'S' in 'S::E'}}
};