From f2896bc9618bdc052563ee59d479b425a8442943 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 5 Jul 2010 16:42:20 +0200 Subject: [PATCH] re PR c++/44808 (ICE: tree check: expected var_decl, have result_decl in gimplify_modify_expr) PR c++/44808 * gimplify.c (gimplify_modify_expr): Only SET_DECL_DEBUG_EXPR if *from_p is VAR_DECL. * g++.dg/opt/nrv16.C: New test. From-SVN: r161838 --- gcc/ChangeLog | 6 ++++++ gcc/gimplify.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/opt/nrv16.C | 16 ++++++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/opt/nrv16.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a1b5a42b00a..3e7eaa36552 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-07-05 Jakub Jelinek + + PR c++/44808 + * gimplify.c (gimplify_modify_expr): Only SET_DECL_DEBUG_EXPR if + *from_p is VAR_DECL. + 2010-07-05 Nathan Froyd * tree.h (build_call_list): Remove. diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 5559f0e3698..4440af50b7f 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -4559,7 +4559,7 @@ gimplify_modify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p, /* Try to alleviate the effects of the gimplification creating artificial temporaries (see for example is_gimple_reg_rhs) on the debug info. */ if (!gimplify_ctxp->into_ssa - && DECL_P (*from_p) + && TREE_CODE (*from_p) == VAR_DECL && DECL_IGNORED_P (*from_p) && DECL_P (*to_p) && !DECL_IGNORED_P (*to_p)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b05391a97c4..3a7b0410ef5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-07-05 Jakub Jelinek + + PR c++/44808 + * g++.dg/opt/nrv16.C: New test. + 2010-07-05 Richard Guenther PR tree-optimization/44784 diff --git a/gcc/testsuite/g++.dg/opt/nrv16.C b/gcc/testsuite/g++.dg/opt/nrv16.C new file mode 100644 index 00000000000..7b24d4a4ee0 --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/nrv16.C @@ -0,0 +1,16 @@ +// PR c++/44808 +// { dg-do compile } + +struct S +{ + void *a, *b; + int c; +}; + +S +foo () +{ + S x; + S y = x; + return x; +} -- 2.30.2