maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[fixup][Sema] Allow in C to define tags inside enumerations. 

Fix for too aggressive error err_type_defined_in_enum introduced in
r313386. Defining tags inside enumerations is prohibited in C++ but
allowed in C.

Reviewers: aaron.ballman, rnk, doug.gregor

Reviewed By: rnk

Subscribers: alberto_magni, cfe-commits

Differential Revision: https://reviews.llvm.org/D38109

llvm-svn: 313894
This commit is contained in:
Volodymyr Sapsai 2017-09-21 17:41:30 +00:00
parent 58f02afecd
commit 8c9fde598b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Sema/SemaDecl.cpp
View File

@ -13916,7 +13916,8 @@ CreateNewDecl:
Invalid = true; Invalid = true;
} }
if (!Invalid && TUK == TUK_Definition && DC->getDeclKind() == Decl::Enum) { if (!Invalid && getLangOpts().CPlusPlus && TUK == TUK_Definition &&
DC->getDeclKind() == Decl::Enum) {
Diag(New->getLocation(), diag::err_type_defined_in_enum) Diag(New->getLocation(), diag::err_type_defined_in_enum)
<< Context.getTagDeclType(New); << Context.getTagDeclType(New);
Invalid = true; Invalid = true;

3
clang/test/Sema/enum.c
View File

@ -125,9 +125,10 @@ enum Color { Red, Green, Blue }; // expected-note{{previous use is here}}
typedef struct Color NewColor; // expected-error {{use of 'Color' with tag type that does not match previous declaration}} typedef struct Color NewColor; // expected-error {{use of 'Color' with tag type that does not match previous declaration}}
// PR28903 // PR28903
// In C it is valid to define tags inside enums.
struct PR28903 { struct PR28903 {
enum { enum {
PR28903_A = (enum { // expected-error-re {{'enum PR28903::(anonymous at {{.*}})' cannot be defined in an enumeration}} PR28903_A = (enum {
PR28903_B, PR28903_B,
PR28903_C = PR28903_B PR28903_C = PR28903_B
})0 })0