diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2004-11-01 00:07:10 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2004-11-01 00:07:10 +0000 |
| commit | 80439563c5704b4daca5e0dbc898771523354645 (patch) | |
| tree | ec81a164c2f746c8558e3f7779a015d4d716b7c0 /gcc/cp | |
| parent | 8d511b90979177c471d1b96aad76ec064bd3b517 (diff) | |
| download | gcc-80439563c5704b4daca5e0dbc898771523354645.zip gcc-80439563c5704b4daca5e0dbc898771523354645.tar.gz gcc-80439563c5704b4daca5e0dbc898771523354645.tar.bz2 | |
re PR c++/15172 (Copy constructor optimization in aggregate initialization)
PR c++/15172
* typeck2.c (store_init_value): Use split_nonconstant_init even
for types that require construction.
PR c++/15172
* g++.dg/init/aggr2.C: New test.
From-SVN: r89922
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/typeck2.c | 26 |
2 files changed, 15 insertions, 17 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fee23b5..3337312 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2004-10-31 Mark Mitchell <mark@codesourcery.com> + + PR c++/15172 + * typeck2.c (store_init_value): Use split_nonconstant_init even + for types that require construction. + 1004-10-28 Matt Austern <austern@apple.com> PR c++/17542 diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index d28949c..46cbaea 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -604,24 +604,16 @@ store_init_value (tree decl, tree init) /* Digest the specified initializer into an expression. */ value = digest_init (type, init, (tree *) 0); - - /* Store the expression if valid; else report error. */ - - if (TREE_CODE (value) == ERROR_MARK) - ; - /* Other code expects that initializers for objects of types that need - constructing never make it into DECL_INITIAL, and passes 'init' to - build_aggr_init without checking DECL_INITIAL. So just return. */ - else if (TYPE_NEEDS_CONSTRUCTING (type)) - return build2 (INIT_EXPR, type, decl, value); - else if (TREE_STATIC (decl) - && (TREE_SIDE_EFFECTS (value) - || ! initializer_constant_valid_p (value, TREE_TYPE (value)))) + /* If the initializer is not a constant, fill in DECL_INITIAL with + the bits that are constant, and then return an expression that + will perform the dynamic initialization. */ + if (value != error_mark_node + && (TREE_SIDE_EFFECTS (value) + || ! initializer_constant_valid_p (value, TREE_TYPE (value)))) return split_nonconstant_init (decl, value); - - /* Store the VALUE in DECL_INITIAL. If we're building a - statement-tree we will actually expand the initialization later - when we output this function. */ + /* If the value is a constant, just put it in DECL_INITIAL. If DECL + is an automatic variable, the middle end will turn this into a + dynamic initialization later. */ DECL_INITIAL (decl) = value; return NULL_TREE; } |