Author: aaronballman
Date: Thu Oct 11 09:40:18 2018
New Revision: 344259
URL: http://llvm.org/viewvc/llvm-project?rev=344259&view=rev
Log:
Improve -Wshadow warnings with enumerators.
Addresses PR24718 by checking for enumerators that shadow other enumerators.
Catches issues like:
enum E1{e1};
void f(void) {
enum E2{e1};
}
Modified:
cfe/trunk/lib/Sema/SemaDecl.cpp
cfe/trunk/test/Sema/warn-shadow.c
cfe/trunk/test/SemaCXX/warn-shadow.cpp
Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Thu Oct 11 09:40:18 2018
@@ -16269,8 +16269,10 @@ Decl *Sema::ActOnEnumConstant(Scope *S,
// Verify that there isn't already something declared with this name in this
// scope.
- NamedDecl *PrevDecl = LookupSingleName(S, Id, IdLoc, LookupOrdinaryName,
- ForVisibleRedeclaration);
+ LookupResult R(*this, Id, IdLoc, LookupOrdinaryName,
ForVisibleRedeclaration);
+ LookupName(R, S);
+ NamedDecl *PrevDecl = R.getAsSingle<NamedDecl>();
+
if (PrevDecl && PrevDecl->isTemplateParameter()) {
// Maybe we will complain about the shadowed template parameter.
DiagnoseTemplateParameterShadow(IdLoc, PrevDecl);
@@ -16293,6 +16295,11 @@ Decl *Sema::ActOnEnumConstant(Scope *S,
return nullptr;
if (PrevDecl) {
+ if (!TheEnumDecl->isScoped()) {
+ // Check for other kinds of shadowing not already handled.
+ CheckShadow(New, PrevDecl, R);
+ }
+
// When in C++, we may get a TagDecl with the same name; in this case the
// enum constant will 'hide' the tag.
assert((getLangOpts().CPlusPlus || !isa<TagDecl>(PrevDecl)) &&
Modified: cfe/trunk/test/Sema/warn-shadow.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/warn-shadow.c?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- cfe/trunk/test/Sema/warn-shadow.c (original)
+++ cfe/trunk/test/Sema/warn-shadow.c Thu Oct 11 09:40:18 2018
@@ -59,3 +59,8 @@ void rdar8883302() {
void test8() {
int bob; // expected-warning {{declaration shadows a variable in the global
scope}}
}
+
+enum PR24718_1{pr24718}; // expected-note {{previous declaration is here}}
+void PR24718(void) {
+ enum PR24718_2{pr24718}; // expected-warning {{declaration shadows a
variable in the global scope}}
+}
Modified: cfe/trunk/test/SemaCXX/warn-shadow.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-shadow.cpp?rev=344259&r1=344258&r2=344259&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/warn-shadow.cpp (original)
+++ cfe/trunk/test/SemaCXX/warn-shadow.cpp Thu Oct 11 09:40:18 2018
@@ -222,3 +222,6 @@ void f(int a) {
};
}
}
+
+int PR24718;
+enum class X { PR24718 }; // Ok, not shadowing
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
