[cfe-commits] r152918 - in /cfe/trunk: include/clang/Basic/DiagnosticParseKinds.td lib/Sema/SemaDecl.cpp test/Sema/c89.c

[Eli Friedman]

On Fri, Mar 16, 2012 at 5:15 AM, David Chisnall <csdavec at swan.ac.uk> wrote:
> Author: theraven
> Date: Fri Mar 16 07:15:37 2012
> New Revision: 152918
>
> URL: http://llvm.org/viewvc/llvm-project?rev=152918&view=rev
> Log:
> Warn on flexible array members when in C89 mode, with -pedantic.
> This fixes PR 4307.
>
> Patch by Eitan Adler!
>
>
> Modified:
>    cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
>    cfe/trunk/lib/Sema/SemaDecl.cpp
>    cfe/trunk/test/Sema/c89.c
>
> Modified: cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td?rev=152918&r1=152917&r2=152918&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td (original)
> +++ cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td Fri Mar 16 07:15:37 2012
> @@ -56,6 +56,8 @@
>   "variable declaration in for loop is a C99-specific feature">, InGroup<C99>;
>  def ext_c99_compound_literal : Extension<
>   "compound literals are a C99-specific feature">, InGroup<C99>;
> +def ext_c99_flexible_array_member : Extension<
> +  "Flexible array members are a C99-specific feature">, InGroup<C99>;

Don't captitalize diagnostics.

>  def ext_enumerator_list_comma : Extension<
>   "commas at the end of enumerator lists are a %select{C99|C++11}0-specific "
>   "feature">;
>
> Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=152918&r1=152917&r2=152918&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaDecl.cpp Fri Mar 16 07:15:37 2012
> @@ -9483,6 +9483,13 @@
>         else if (Fields.size() == 1)
>           Diag(FD->getLocation(), diag::ext_flexible_array_empty_aggregate_gnu)
>             << FD->getDeclName() << Record->getTagKind();
> +      } else if (!getLangOpts().C99) {
> +      if (Record->isUnion())
> +        Diag(FD->getLocation(), diag::ext_flexible_array_union_gnu)
> +          << FD->getDeclName();
> +      else
> +        Diag(FD->getLocation(), diag::ext_c99_flexible_array_member)
> +          << FD->getDeclName() << Record->getTagKind();

This change makes us accept the following in c89 mode, but not c99 mode:

struct x { int y[]; };

-Eli