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

Use the 'declaration does not declare anything' error when we see an anonymous struct/union declaration outside of a struct or union in C 

llvm-svn: 66303
This commit is contained in:
Douglas Gregor 2009-03-06 23:06:59 +00:00
parent f5d0613ce9
commit 2e7cba6208
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/DiagnosticSemaKinds.def
View File

@ -1215,8 +1215,6 @@ DIAG(err_anonymous_union_with_storage_spec, ERROR,
"anonymous union at class scope must not have a storage specifier") "anonymous union at class scope must not have a storage specifier")
DIAG(err_anonymous_struct_not_member, ERROR, DIAG(err_anonymous_struct_not_member, ERROR,
"anonymous %select{structs|structs and classes}0 must be %select{struct or union|class}0 members") "anonymous %select{structs|structs and classes}0 must be %select{struct or union|class}0 members")
DIAG(err_anonymous_union_not_member, ERROR,
"anonymous unions must be struct or union members")
DIAG(err_anonymous_union_member_redecl, ERROR, DIAG(err_anonymous_union_member_redecl, ERROR,
"member of anonymous union redeclares %0") "member of anonymous union redeclares %0")
DIAG(err_anonymous_struct_member_redecl, ERROR, DIAG(err_anonymous_struct_member_redecl, ERROR,

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

@ -922,8 +922,14 @@ Sema::DeclTy *Sema::ParsedFreeStandingDeclSpec(Scope *S, DeclSpec &DS) {
if (RecordDecl *Record = dyn_cast_or_null<RecordDecl>(Tag)) { if (RecordDecl *Record = dyn_cast_or_null<RecordDecl>(Tag)) {
if (!Record->getDeclName() && Record->isDefinition() && if (!Record->getDeclName() && Record->isDefinition() &&
DS.getStorageClassSpec() != DeclSpec::SCS_typedef) DS.getStorageClassSpec() != DeclSpec::SCS_typedef) {
return BuildAnonymousStructOrUnion(S, DS, Record); if (getLangOptions().CPlusPlus ||
Record->getDeclContext()->isRecord())
return BuildAnonymousStructOrUnion(S, DS, Record);
Diag(DS.getSourceRange().getBegin(), diag::err_no_declarators)
<< DS.getSourceRange();
}
// Microsoft allows unnamed struct/union fields. Don't complain // Microsoft allows unnamed struct/union fields. Don't complain
// about them. // about them.
@ -1102,14 +1108,7 @@ Sema::DeclTy *Sema::BuildAnonymousStructOrUnion(Scope *S, DeclSpec &DS,
Invalid = true; Invalid = true;
} }
} }
} else { }
// FIXME: Check GNU C semantics
if (Record->isUnion() && !Owner->isRecord()) {
Diag(Record->getLocation(), diag::err_anonymous_union_not_member)
<< (int)getLangOptions().CPlusPlus;
Invalid = true;
}
}
if (!Record->isUnion() && !Owner->isRecord()) { if (!Record->isUnion() && !Owner->isRecord()) {
Diag(Record->getLocation(), diag::err_anonymous_struct_not_member) Diag(Record->getLocation(), diag::err_anonymous_struct_not_member)

8
clang/test/Sema/anonymous-struct-union.c
View File

@ -50,12 +50,12 @@ struct Redecl {
void zz(); // expected-error{{duplicate member 'zz'}} void zz(); // expected-error{{duplicate member 'zz'}}
}; };
union { // expected-error{{anonymous unions must be struct or union members}} union { // expected-error{{declaration does not declare anything}}
int int_val; int int_val;
float float_val; float float_val;
}; };
static union { // expected-error{{anonymous unions must be struct or union members}} static union { // expected-error{{declaration does not declare anything}}
int int_val2; int int_val2;
float float_val2; float float_val2;
}; };
@ -66,7 +66,7 @@ void f() {
} }
void g() { void g() {
union { // expected-error{{anonymous unions must be struct or union members}} union { // expected-error{{declaration does not declare anything}}
int i; int i;
float f2; float f2;
}; };
@ -87,3 +87,5 @@ struct s1 {
int f0; // expected-error{{member of anonymous union redeclares 'f0'}} int f0; // expected-error{{member of anonymous union redeclares 'f0'}}
}; };
}; };
struct {}; // expected-error{{declaration does not declare anything}}