diff options
| author | Jason Merrill <jason@redhat.com> | 2010-08-19 13:00:51 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-08-19 13:00:51 -0400 |
| commit | ce3beba3df013a2ebffbde6bf691f396dd968f61 (patch) | |
| tree | 07707b32a91d6054569c09547fee746ce8b65038 /gcc/cp | |
| parent | 2c5df20f2ee3af837efdcf9a384a5fb600791050 (diff) | |
| download | gcc-ce3beba3df013a2ebffbde6bf691f396dd968f61.zip gcc-ce3beba3df013a2ebffbde6bf691f396dd968f61.tar.gz gcc-ce3beba3df013a2ebffbde6bf691f396dd968f61.tar.bz2 | |
re PR middle-end/45307 (Stores expanding to no RTL not removed by tree optimizers, Empty ctors/dtors not eliminated)
PR c++/45307
* gimplify.c (gimplify_init_constructor): Just return GS_UNHANDLED
if ctor is empty.
(gimplify_modify_expr_rhs): Adjust.
From-SVN: r163380
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d93fd4a..7667bb6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2010-08-19 Jason Merrill <jason@redhat.com> + PR c++/45307 + * cp-gimplify.c (cp_gimplify_expr): Also remove assignment + of empty class CONSTRUCTOR. + * except.c (pending_noexcept, pending_noexcept_checks): New. (perform_deferred_noexcept_checks): New. (maybe_noexcept_warning): Split from... diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index abd5bf3..e5a7f26 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -575,15 +575,18 @@ cp_gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p) TREE_OPERAND (*expr_p, 1) = build1 (VIEW_CONVERT_EXPR, TREE_TYPE (op0), op1); - else if ((is_gimple_lvalue (op1) || INDIRECT_REF_P (op1)) - && !(TREE_CODE (op1) == CALL_EXPR - && CALL_EXPR_RETURN_SLOT_OPT (op1)) + else if ((is_gimple_lvalue (op1) || INDIRECT_REF_P (op1) + || (TREE_CODE (op1) == CONSTRUCTOR + && CONSTRUCTOR_NELTS (op1) == 0) + || (TREE_CODE (op1) == CALL_EXPR + && !CALL_EXPR_RETURN_SLOT_OPT (op1))) && is_really_empty_class (TREE_TYPE (op0))) { /* Remove any copies of empty classes. We check that the RHS - has a simple form so that TARGET_EXPRs and CONSTRUCTORs get - reduced properly, and we leave the return slot optimization - alone because it isn't a copy. + has a simple form so that TARGET_EXPRs and non-empty + CONSTRUCTORs get reduced properly, and we leave the return + slot optimization alone because it isn't a copy (FIXME so it + shouldn't be represented as one). Also drop volatile variables on the RHS to avoid infinite recursion from gimplify_expr trying to load the value. */ |