diff options
| author | Jason Merrill <jason@redhat.com> | 2010-09-06 00:48:58 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-09-06 00:48:58 -0400 |
| commit | 467649eb698b5276610f8509432eb7a5f721c5f3 (patch) | |
| tree | 17a000352cfec379f1555df11964834e0964b1e8 /gcc/cp | |
| parent | b3db2bea4e40079cb791fb9b890f8cd346e95c1a (diff) | |
| download | gcc-467649eb698b5276610f8509432eb7a5f721c5f3.zip gcc-467649eb698b5276610f8509432eb7a5f721c5f3.tar.gz gcc-467649eb698b5276610f8509432eb7a5f721c5f3.tar.bz2 | |
semantics.c (finish_compound_literal): Always build a TARGET_EXPR.
* semantics.c (finish_compound_literal): Always build a
TARGET_EXPR.
From-SVN: r163893
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 15 |
2 files changed, 6 insertions, 14 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 071f8d6..b2da825 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-06 Jason Merrill <jason@redhat.com> + + * semantics.c (finish_compound_literal): Always build a + TARGET_EXPR. + 2010-08-30 Paolo Carlini <paolo.carlini@oracle.com> PR c++/45043 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 0afa8f9..17c795f 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -2203,20 +2203,7 @@ finish_compound_literal (tree type, tree compound_literal) if (TREE_CODE (type) == ARRAY_TYPE) cp_complete_array_type (&type, compound_literal, false); compound_literal = digest_init (type, compound_literal); - if ((!at_function_scope_p () || CP_TYPE_CONST_P (type)) - && initializer_constant_valid_p (compound_literal, type)) - { - tree decl = create_temporary_var (type); - DECL_INITIAL (decl) = compound_literal; - TREE_STATIC (decl) = 1; - cp_apply_type_quals_to_decl (cp_type_quals (type), decl); - decl = pushdecl_top_level (decl); - DECL_NAME (decl) = make_anon_name (); - SET_DECL_ASSEMBLER_NAME (decl, DECL_NAME (decl)); - return decl; - } - else - return get_target_expr (compound_literal); + return get_target_expr (compound_literal); } /* Return the declaration for the function-name variable indicated by |