From 508d0d3fe8d1677e8f7337dd2e374ce20a667f38 Mon Sep 17 00:00:00 2001 From: hubicka Date: Sat, 13 Sep 2008 14:38:10 +0000 Subject: [PATCH] PR tree-optimization/37392 * tree-inline.c (remap_gimple_stmt): Do not remap return value. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@140342 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/tree-inline.c | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7929d7e6634..1f07adadeb9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2008-09-13 Jan Hubicka + + PR tree-optimization/37392 + * tree-inline.c (remap_gimple_stmt): Do not remap return value. + 2008-09-13 Martin Jambor Jan Hubicka diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 114cd4718e3..ebc8b32916b 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -1029,6 +1029,7 @@ remap_gimple_stmt (gimple stmt, copy_body_data *id) gimple copy = NULL; struct walk_stmt_info wi; tree new_block; + bool skip_first = false; /* Begin by recognizing trees that we'll completely rewrite for the inlining context. Our output for these trees is completely @@ -1050,7 +1051,11 @@ remap_gimple_stmt (gimple stmt, copy_body_data *id) already been set (e.g. a recent "foo (&result_decl, ...)"); just toss the entire GIMPLE_RETURN. */ if (retval && TREE_CODE (retval) != RESULT_DECL) - copy = gimple_build_assign (id->retvar, retval); + { + copy = gimple_build_assign (id->retvar, retval); + /* id->retvar is already substituted. Skip it on later remapping. */ + skip_first = true; + } else return gimple_build_nop (); } @@ -1216,7 +1221,10 @@ remap_gimple_stmt (gimple stmt, copy_body_data *id) /* Remap all the operands in COPY. */ memset (&wi, 0, sizeof (wi)); wi.info = id; - walk_gimple_op (copy, remap_gimple_op_r, &wi); + if (skip_first) + walk_tree (gimple_op_ptr (copy, 1), remap_gimple_op_r, &wi, NULL); + else + walk_gimple_op (copy, remap_gimple_op_r, &wi); /* We have to handle EH region remapping of GIMPLE_RESX specially because the region number is not an operand. */ -- 2.11.4.GIT