From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 10 Jun 2002 21:39:48 +0000 (+0200)
Subject: cfgcleanup.c (try_optimize_cfg): Make sure merge_blocks doesn't merge bb with itself.
X-Git-Tag: releases/gcc-3.1.1~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9f534efa5c6b0674ec0492cba6501fa6a119cd3;p=thirdparty%2Fgcc.git

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: r54458
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db99dd9fec09..a90a915f7bc7 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-07  Jason Thorpe  <thorpej@wasabisystems.com>
 
 	* config.gcc (mips*-*-netbsd*): Add mips/t-netbsd to ${tmake_file}.
diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index ed48b6ec67d4..32ae77a3be63 100644
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -1634,6 +1634,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 68d54d29d9c2..83708fdfe0e6 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-05-29  Hans-Peter Nilsson  <hp@axis.com>
 
 	* gcc.c-torture/execute/20020529-1.c: New test.