diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2013-12-11 10:18:33 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2013-12-11 10:18:33 +0100 |
| commit | f8cb36a94c67ec4723475e68df75f9571b4ed198 (patch) | |
| tree | 360af5e11bcd5b815e520289e341d8e82c81385a | |
| parent | ba8267926cfcaddc979ba021882ba2ff2f50003d (diff) | |
| download | gcc-f8cb36a94c67ec4723475e68df75f9571b4ed198.zip gcc-f8cb36a94c67ec4723475e68df75f9571b4ed198.tar.gz gcc-f8cb36a94c67ec4723475e68df75f9571b4ed198.tar.bz2 | |
re PR tree-optimization/59386 (ICE on valid code at -O2 and -O3 on x86_64-linux-gnu in 64-bit mode)
PR tree-optimization/59386
* tree-inline.c (remap_gimple_stmt): If not id->do_not_unshare,
unshare_expr (id->retval) before passing it to gimple_build_assign.
* gcc.c-torture/compile/pr59386.c: New test.
From-SVN: r205883
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr59386.c | 24 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 4 |
4 files changed, 38 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c581a97..22caa76 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-12-11 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/59386 + * tree-inline.c (remap_gimple_stmt): If not id->do_not_unshare, + unshare_expr (id->retval) before passing it to gimple_build_assign. + 2013-12-11 Bin Cheng <bin.cheng@arm.com> Reverted: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 02da360..ebd99960 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-12-11 Jakub Jelinek <jakub@redhat.com> + + PR tree-optimization/59386 + * gcc.c-torture/compile/pr59386.c: New test. + 2013-12-11 Bin Cheng <bin.cheng@arm.com> Reverted: diff --git a/gcc/testsuite/gcc.c-torture/compile/pr59386.c b/gcc/testsuite/gcc.c-torture/compile/pr59386.c new file mode 100644 index 0000000..b014f70 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/pr59386.c @@ -0,0 +1,24 @@ +/* PR tree-optimization/59386 */ + +struct S { int s; }; +struct T { int t; struct S u; } c; +int b; + +struct S +foo () +{ + struct T d; + if (b) + while (c.t) + ; + else + return d.u; +} + +struct S +bar () +{ + struct T a; + a.u = foo (); + return a.u; +} diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index ab8e40b..96a4805 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -1273,7 +1273,9 @@ remap_gimple_stmt (gimple stmt, copy_body_data *id) || ! SSA_NAME_VAR (retval) || TREE_CODE (SSA_NAME_VAR (retval)) != RESULT_DECL))) { - copy = gimple_build_assign (id->retvar, retval); + copy = gimple_build_assign (id->do_not_unshare + ? id->retvar : unshare_expr (id->retvar), + retval); /* id->retvar is already substituted. Skip it on later remapping. */ skip_first = true; } |