aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2011-01-02 18:07:15 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2011-01-02 18:07:15 +0100
commitbc470c243a8bbecdb92f2a7f4636f92db6fe0120 (patch)
tree5ef681ee68f0e49503bc7fb851a8a95b133b3c40
parent7dfef5845a42894b26155ecc65844a03f1b4fb5e (diff)
downloadgcc-bc470c243a8bbecdb92f2a7f4636f92db6fe0120.zip
gcc-bc470c243a8bbecdb92f2a7f4636f92db6fe0120.tar.gz
gcc-bc470c243a8bbecdb92f2a7f4636f92db6fe0120.tar.bz2
re PR rtl-optimization/47028 (gcc.dg/tree-ssa/tailrecursion-[57].c FAIL with -foptimize-sibling-calls -fno-forward-propagate -fno-tree-copy-prop -fno-tree-dominator-opts)
PR rtl-optimization/47028 * cfgexpand.c (gimple_expand_cfg): Insert entry edge insertions after parm_birth_insn instead of at the beginning of first bb. * gcc.dg/pr47028.c: New test. From-SVN: r168401
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/cfgexpand.c14
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/pr47028.c19
4 files changed, 44 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9a793f4..343e510 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-02 Jakub Jelinek <jakub@redhat.com>
+
+ PR rtl-optimization/47028
+ * cfgexpand.c (gimple_expand_cfg): Insert entry edge
+ insertions after parm_birth_insn instead of at the beginning
+ of first bb.
+
2011-01-02 Mingjie Xing <mingjie.xing@gmail.com>
* doc/generic.texi: Remove duplicated "@subsubsection Statements".
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index a3940d0..13c63be 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -4085,7 +4085,19 @@ gimple_expand_cfg (void)
for (ei = ei_start (bb->succs); (e = ei_safe_edge (ei)); )
{
if (e->insns.r)
- commit_one_edge_insertion (e);
+ {
+ /* Avoid putting insns before parm_birth_insn. */
+ if (e->src == ENTRY_BLOCK_PTR
+ && single_succ_p (ENTRY_BLOCK_PTR)
+ && parm_birth_insn)
+ {
+ rtx insns = e->insns.r;
+ e->insns.r = NULL_RTX;
+ emit_insn_after_noloc (insns, parm_birth_insn, e->dest);
+ }
+ else
+ commit_one_edge_insertion (e);
+ }
else
ei_next (&ei);
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3ba53467..09e47cf 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-02 Jakub Jelinek <jakub@redhat.com>
+
+ PR rtl-optimization/47028
+ * gcc.dg/pr47028.c: New test.
+
2011-01-02 Nicola Pero <nicola.pero@meta-innovation.com>
* objc.dg/protocol-forward-1.m: Removed TODO.
diff --git a/gcc/testsuite/gcc.dg/pr47028.c b/gcc/testsuite/gcc.dg/pr47028.c
new file mode 100644
index 0000000..3f80ff1
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr47028.c
@@ -0,0 +1,19 @@
+/* PR rtl-optimization/47028 */
+/* { dg-do run } */
+/* { dg-options "-O -foptimize-sibling-calls -fno-forward-propagate -fno-tree-copy-prop -fno-tree-dominator-opts" } */
+
+int
+fib (int n)
+{
+ if (n <= 1)
+ return 1;
+ return fib (n - 2) + fib (n - 1);
+}
+
+int
+main (void)
+{
+ if (fib (5) != 8)
+ __builtin_abort ();
+ return 0;
+}