aboutsummaryrefslogtreecommitdiff
path: root/gcc/gimplify.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2007-08-27 16:02:22 -0400
committerJason Merrill <jason@gcc.gnu.org>2007-08-27 16:02:22 -0400
commit83d7e8f06ecf948275efda077533032fe65a4855 (patch)
tree0beec1120900beb0a9e1598d152f7637242092b1 /gcc/gimplify.c
parent9da72d66843838db60867accef31278aa961833c (diff)
downloadgcc-83d7e8f06ecf948275efda077533032fe65a4855.zip
gcc-83d7e8f06ecf948275efda077533032fe65a4855.tar.gz
gcc-83d7e8f06ecf948275efda077533032fe65a4855.tar.bz2
re PR c++/31337 (ICE with statement expression)
PR c++/31337 * gimplify.c (gimplify_modify_expr): Discard the assignment of zero-sized types after calling gimplify_modify_expr_rhs. * testsuite/g++.dg/ext/stmtexpr11.C: New. From-SVN: r127838
Diffstat (limited to 'gcc/gimplify.c')
-rw-r--r--gcc/gimplify.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index cea7991..aed8ab7 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -3654,8 +3654,16 @@ gimplify_modify_expr (tree *expr_p, tree *pre_p, tree *post_p, bool want_value)
|| TREE_CODE (*expr_p) == GIMPLE_MODIFY_STMT
|| TREE_CODE (*expr_p) == INIT_EXPR);
- /* For zero sized types only gimplify the left hand side and right hand side
- as statements and throw away the assignment. */
+ /* See if any simplifications can be done based on what the RHS is. */
+ ret = gimplify_modify_expr_rhs (expr_p, from_p, to_p, pre_p, post_p,
+ want_value);
+ if (ret != GS_UNHANDLED)
+ return ret;
+
+ /* For zero sized types only gimplify the left hand side and right hand
+ side as statements and throw away the assignment. Do this after
+ gimplify_modify_expr_rhs so we handle TARGET_EXPRs of addressable
+ types properly. */
if (zero_sized_type (TREE_TYPE (*from_p)))
{
gimplify_stmt (from_p);
@@ -3666,12 +3674,6 @@ gimplify_modify_expr (tree *expr_p, tree *pre_p, tree *post_p, bool want_value)
return GS_ALL_DONE;
}
- /* See if any simplifications can be done based on what the RHS is. */
- ret = gimplify_modify_expr_rhs (expr_p, from_p, to_p, pre_p, post_p,
- want_value);
- if (ret != GS_UNHANDLED)
- return ret;
-
/* If the value being copied is of variable width, compute the length
of the copy into a WITH_SIZE_EXPR. Note that we need to do this
before gimplifying any of the operands so that we can resolve any