aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2002-06-10 23:36:15 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2002-06-10 23:36:15 +0200
commit2bf87216b2fe2fa2dca9c565771006d355e4f6d8 (patch)
tree7ec1ac88f5e3d19ee1a46df7ee82526f46053be6
parent135fd2d8604aa7c1cdaee281d420a922e1234aef (diff)
downloadgcc-2bf87216b2fe2fa2dca9c565771006d355e4f6d8.zip
gcc-2bf87216b2fe2fa2dca9c565771006d355e4f6d8.tar.gz
gcc-2bf87216b2fe2fa2dca9c565771006d355e4f6d8.tar.bz2
cfgcleanup.c (try_optimize_cfg): Make sure merge_blocks doesn't merge bb with itself.
* cfgcleanup.c (try_optimize_cfg): Make sure merge_blocks doesn't merge bb with itself. * gcc.c-torture/compile/20020605-1.c: New test. From-SVN: r54456
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cfgcleanup.c1
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.c-torture/compile/20020605-1.c17
4 files changed, 27 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4d085336..0964d27 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-10 Jakub Jelinek <jakub@redhat.com>
+
+ * cfgcleanup.c (try_optimize_cfg): Make sure merge_blocks doesn't
+ merge bb with itself.
+
2002-06-10 Richard Henderson <rth@redhat.com>
* config/alpha/alpha.md (builtin_zap): Fix thinkos expanding mask.
diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 2e6e02d..74b8d33 100644
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -1675,6 +1675,7 @@ try_optimize_cfg (mode)
&& !(s->flags & EDGE_COMPLEX)
&& (c = s->dest) != EXIT_BLOCK_PTR
&& c->pred->pred_next == NULL
+ && b != c
/* If the jump insn has side effects,
we can't kill the edge. */
&& (GET_CODE (b->end) != JUMP_INSN
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ea104cf..afc08f4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-10 Jakub Jelinek <jakub@redhat.com>
+
+ * gcc.c-torture/compile/20020605-1.c: New test.
+
2002-06-07 Roger Sayle <roger@eyesopen.com>
* gcc.dg/20020607-2.c: New test case.
diff --git a/gcc/testsuite/gcc.c-torture/compile/20020605-1.c b/gcc/testsuite/gcc.c-torture/compile/20020605-1.c
new file mode 100644
index 0000000..960a4be
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/20020605-1.c
@@ -0,0 +1,17 @@
+/* This testcase caused on IA-32 -O2 endless loop in
+ merge_blocks when trying to merge a basic block
+ with itself. */
+
+void f (void)
+{
+ char *c;
+ do
+ {
+ if (c)
+ break;
+ }
+ while (1);
+ if (!c)
+ while (1)
+ f ();
+}