diff options
| author | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-10-20 12:34:19 +0000 |
|---|---|---|
| committer | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-10-20 12:34:19 +0000 |
| commit | df8d8dce8675c71953bcfa9b23f96732b5c3a02d (patch) | |
| tree | 796b6dcd88162d6b1985dc47679626371dd0154e | |
| parent | 0c30cda1d6d5034e6107ff5a0dcb5026f4bceebb (diff) | |
| download | gcc-df8d8dce8675c71953bcfa9b23f96732b5c3a02d.tar.gz | |
2015-10-20 Richard Biener <rguenther@suse.de>
PR tree-optimization/68017
* tree-tailcall.c (eliminate_tail_call): Remove stmts backwards.
* gcc.dg/torture/pr68017.c: New testcase.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229073 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/torture/pr68017.c | 17 | ||||
| -rw-r--r-- | gcc/tree-tailcall.c | 20 |
4 files changed, 39 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 45fc66ab95e..f79e71d5483 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-10-20 Richard Biener <rguenther@suse.de> + + PR tree-optimization/68017 + * tree-tailcall.c (eliminate_tail_call): Remove stmts backwards. + 2015-10-20 Martin Liska <mliska@suse.cz> * cgraphclones.c (cgraph_node::create_virtual_clone): diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4415ac38fe0..617ecf4d8b3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-10-20 Richard Biener <rguenther@suse.de> + + PR tree-optimization/68017 + * gcc.dg/torture/pr68017.c: New testcase. + 2015-10-20 Szabolcs Nagy <szabolcs.nagy@arm.com> PR target/66912 diff --git a/gcc/testsuite/gcc.dg/torture/pr68017.c b/gcc/testsuite/gcc.dg/torture/pr68017.c new file mode 100644 index 00000000000..1fc219171bf --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr68017.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +/* { dg-options "-g" } */ + +long long a; + +short +fn1 (short p1, unsigned short p2) +{ + return p1 + p2; +} + +short +fn2 () +{ + int b = a ? fn1 (fn2 (), a) : 0; + return b; +} diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c index e97f6db89d8..098fff07d2f 100644 --- a/gcc/tree-tailcall.c +++ b/gcc/tree-tailcall.c @@ -847,17 +847,21 @@ eliminate_tail_call (struct tailcall *t) possibly unreachable code in other blocks is removed later in cfg cleanup. */ gsi = t->call_gsi; - gsi_next (&gsi); - while (!gsi_end_p (gsi)) + gimple_stmt_iterator gsi2 = gsi_last_bb (gimple_bb (gsi_stmt (gsi))); + while (gsi_stmt (gsi2) != gsi_stmt (gsi)) { - gimple *t = gsi_stmt (gsi); + gimple *t = gsi_stmt (gsi2); /* Do not remove the return statement, so that redirect_edge_and_branch sees how the block ends. */ - if (gimple_code (t) == GIMPLE_RETURN) - break; - - gsi_remove (&gsi, true); - release_defs (t); + if (gimple_code (t) != GIMPLE_RETURN) + { + gimple_stmt_iterator gsi3 = gsi2; + gsi_prev (&gsi2); + gsi_remove (&gsi3, true); + release_defs (t); + } + else + gsi_prev (&gsi2); } /* Number of executions of function has reduced by the tailcall. */ |