* cfgcleanup.c (try_optimize_cfg): Make sure merge_blocks doesn't

	merge bb with itself.

	* gcc.c-torture/compile/20020605-1.c: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54456 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 27 insertions, 0 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4d085336386..0964d2700e5 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 2e6e02daba7..74b8d338ca9 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 ea104cf5335..afc08f4b8ce 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 00000000000..960a4be7ed1
--- /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 ();
+}