OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

typeck2.c (store_init_value): Don't re-digest a bracketed initializer. 

* typeck2.c (store_init_value): Don't re-digest a bracketed
        initializer.

        * class.c (finish_struct_anon): Use TYPE_ANONYMOUS_P instead of
        ANON_AGGR_TYPE_P.

From-SVN: r46202
This commit is contained in:
Jason Merrill 2001-10-11 17:33:09 -04:00 committed by Jason Merrill
parent 8206c799f2
commit 6f32162af6
4 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -1,3 +1,11 @@
2001-10-11 Jason Merrill <jason_merrill@redhat.com>
* typeck2.c (store_init_value): Don't re-digest a bracketed
initializer.
* class.c (finish_struct_anon): Use TYPE_ANONYMOUS_P instead of
ANON_AGGR_TYPE_P.
2001-10-11 Richard Henderson <rth@redhat.com>
* class.c (build_vtable_entry_ref): Create a VTABLE_REF instead

6
gcc/cp/class.c
View File

@ -2932,10 +2932,12 @@ finish_struct_anon (t)
declared, but we also find nested classes by noticing
the TYPE_DECL that we create implicitly. You're
allowed to put one anonymous union inside another,
though, so we explicitly tolerate that. */
though, so we explicitly tolerate that. We use
TYPE_ANONYMOUS_P rather than ANON_AGGR_TYPE_P so that
we also allow unnamed types used for defining fields. */
if (DECL_ARTIFICIAL (elt)
&& (!DECL_IMPLICIT_TYPEDEF_P (elt)
|| ANON_AGGR_TYPE_P (TREE_TYPE (elt))))
|| TYPE_ANONYMOUS_P (TREE_TYPE (elt))))
continue;
if (DECL_NAME (elt) == constructor_name (t))

12
gcc/cp/typeck2.c
View File

@ -389,9 +389,15 @@ store_init_value (decl, init)
/* End of special C++ code. */
/* Digest the specified initializer into an expression. */
value = digest_init (type, init, (tree *) 0);
/* We might have already run this bracketed initializer through
digest_init. Don't do so again. */
if (TREE_CODE (init) == CONSTRUCTOR && TREE_HAS_CONSTRUCTOR (init)
&& TREE_TYPE (init)
&& TYPE_MAIN_VARIANT (TREE_TYPE (init)) == TYPE_MAIN_VARIANT (type))
value = init;
else
/* Digest the specified initializer into an expression. */
value = digest_init (type, init, (tree *) 0);
/* Store the expression if valid; else report error. */

22
gcc/testsuite/g++.dg/other/anon2.C Normal file
View File

@ -0,0 +1,22 @@
// Test that we can have an unnamed struct inside an anonymous union.
struct A
{
union
{
struct { int i; } foo;
};
};
static union
{
struct { int i; } foo;
};
int main ()
{
union
{
struct { int i; } bar;
};
}