diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 6 | ||||
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 12 | ||||
| -rw-r--r-- | test/Sema/anonymous-struct-union-c11.c | 19 | ||||
| -rw-r--r-- | test/Sema/array-init.c | 2 |
4 files changed, 31 insertions, 8 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 394f8b089d..05fc863c61 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -4570,9 +4570,11 @@ def ext_in_class_initializer_non_constant : Extension< // C++ anonymous unions and GNU anonymous structs/unions def ext_anonymous_union : Extension< - "anonymous unions are a GNU extension in C">, InGroup<GNU>; -def ext_anonymous_struct : Extension< + "anonymous unions are a C11 extension">, InGroup<C11>; +def ext_gnu_anonymous_struct : Extension< "anonymous structs are a GNU extension">, InGroup<GNU>; +def ext_c11_anonymous_struct : Extension< + "anonymous structs are a C11 extension">, InGroup<C11>; def err_anonymous_union_not_static : Error< "anonymous unions at namespace or global scope must be declared 'static'">; def err_anonymous_union_with_storage_spec : Error< diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 8a0e461ec2..f6f97dddbc 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -2679,18 +2679,20 @@ StorageClassSpecToFunctionDeclStorageClass(DeclSpec::SCS StorageClassSpec) { /// BuildAnonymousStructOrUnion - Handle the declaration of an /// anonymous structure or union. Anonymous unions are a C++ feature -/// (C++ [class.union]) and a GNU C extension; anonymous structures -/// are a GNU C and GNU C++ extension. +/// (C++ [class.union]) and a C11 feature; anonymous structures +/// are a C11 feature and GNU C++ extension. Decl *Sema::BuildAnonymousStructOrUnion(Scope *S, DeclSpec &DS, AccessSpecifier AS, RecordDecl *Record) { DeclContext *Owner = Record->getDeclContext(); // Diagnose whether this anonymous struct/union is an extension. - if (Record->isUnion() && !getLangOptions().CPlusPlus) + if (Record->isUnion() && !getLangOptions().CPlusPlus && !getLangOptions().C11) Diag(Record->getLocation(), diag::ext_anonymous_union); - else if (!Record->isUnion()) - Diag(Record->getLocation(), diag::ext_anonymous_struct); + else if (!Record->isUnion() && getLangOptions().CPlusPlus) + Diag(Record->getLocation(), diag::ext_gnu_anonymous_struct); + else if (!Record->isUnion() && !getLangOptions().C11) + Diag(Record->getLocation(), diag::ext_c11_anonymous_struct); // C and C++ require different kinds of checks for anonymous // structs/unions. diff --git a/test/Sema/anonymous-struct-union-c11.c b/test/Sema/anonymous-struct-union-c11.c new file mode 100644 index 0000000000..229ee52057 --- /dev/null +++ b/test/Sema/anonymous-struct-union-c11.c @@ -0,0 +1,19 @@ +// Check for warnings in non-C11 mode: +// RUN: %clang_cc1 -fsyntax-only -verify -Wc11-extensions %s + +// Expect no warnings in C11 mode: +// RUN: %clang_cc1 -fsyntax-only -pedantic -Werror -std=c11 %s + +struct s { + int a; + struct { // expected-warning{{anonymous structs are a C11 extension}} + int b; + }; +}; + +struct t { + int a; + union { // expected-warning{{anonymous unions are a C11 extension}} + int b; + }; +}; diff --git a/test/Sema/array-init.c b/test/Sema/array-init.c index bd1dfd2c06..a979fb9e57 100644 --- a/test/Sema/array-init.c +++ b/test/Sema/array-init.c @@ -245,7 +245,7 @@ static void sppp_ipv6cp_up(); const struct {} ipcp = { sppp_ipv6cp_up }; //expected-warning{{empty struct is a GNU extension}} \ // expected-warning{{excess elements in struct initializer}} -struct _Matrix { union { float m[4][4]; }; }; //expected-warning{{anonymous unions are a GNU extension in C}} +struct _Matrix { union { float m[4][4]; }; }; //expected-warning{{anonymous unions are a C11 extension}} typedef struct _Matrix Matrix; void test_matrix() { const Matrix mat1 = { |