[cfe-commits] r149966 - in /cfe/trunk: lib/Sema/SemaDecl.cpp test/Sema/anonymous-struct-union.c

[Hans Wennborg]

On Tue, Feb 7, 2012 at 05:00, Eli Friedman <eli.friedman at gmail.com> wrote:
> Author: efriedma
> Date: Mon Feb  6 23:00:47 2012
> New Revision: 149966
>
> URL: http://llvm.org/viewvc/llvm-project?rev=149966&view=rev
> Log:
> Fix a bug in semantic analysis involving anonymous structs and flexible arrays.
>
>
> Modified:
>    cfe/trunk/lib/Sema/SemaDecl.cpp
>    cfe/trunk/test/Sema/anonymous-struct-union.c
>
> Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=149966&r1=149965&r2=149966&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaDecl.cpp Mon Feb  6 23:00:47 2012
> @@ -9171,11 +9171,23 @@
>   if (EnclosingDecl->isInvalidDecl())
>     return;
>
> -  // Verify that all the fields are okay.
> +  RecordDecl *Record = dyn_cast<RecordDecl>(EnclosingDecl);
> +
> +  // Start counting up the number of named members; make sure to include
> +  // members of anonymous structs and unions in the total.
>   unsigned NumNamedMembers = 0;
> +  if (Record) {
> +    for (RecordDecl::decl_iterator i = Record->decls_begin(),
> +                                   e = Record->decls_end(); i != e; i++) {
> +      if (IndirectFieldDecl *IFD = dyn_cast<IndirectFieldDecl>(*i))
> +        if (IFD->getDeclName())
> +          ++NumNamedMembers;
> +    }
> +  }
> +
> +  // Verify that all the fields are okay.
>   SmallVector<FieldDecl*, 32> RecFields;
>
> -  RecordDecl *Record = dyn_cast<RecordDecl>(EnclosingDecl);
>   bool ARCErrReported = false;
>   for (llvm::ArrayRef<Decl *>::iterator i = Fields.begin(), end = Fields.end();
>        i != end; ++i) {
>
> Modified: cfe/trunk/test/Sema/anonymous-struct-union.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/anonymous-struct-union.c?rev=149966&r1=149965&r2=149966&view=diff
> ==============================================================================
> --- cfe/trunk/test/Sema/anonymous-struct-union.c (original)
> +++ cfe/trunk/test/Sema/anonymous-struct-union.c Mon Feb  6 23:00:47 2012
> @@ -102,3 +102,9 @@
>   int x;
>  } a_struct;
>  int tmp = (a_struct) { .x = 0 }; // expected-error {{initializing 'int' with an expression of incompatible type 'a_struct'}}
> +
> +// This example comes out of the C11 standard; make sure we don't accidentally reject it.
> +struct s {
> +  struct { int i; };
> +  int a[];
> +};

Thanks :)