From owner-p4-projects  Fri Mar 21 18:13:53 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 736E037B404; Fri, 21 Mar 2003 18:13:51 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 271BF37B401
	for <perforce@freebsd.org>; Fri, 21 Mar 2003 18:13:51 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 77A4543FA3
	for <perforce@freebsd.org>; Fri, 21 Mar 2003 18:13:50 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2M2Do0U042531
	for <perforce@freebsd.org>; Fri, 21 Mar 2003 18:13:50 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2M2DoSY042528
	for perforce@freebsd.org; Fri, 21 Mar 2003 18:13:50 -0800 (PST)
Date: Fri, 21 Mar 2003 18:13:50 -0800 (PST)
Message-Id: <200303220213.h2M2DoSY042528@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Subject: PERFORCE change 27207 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=27207

Change 27207 by marcel@marcel_vaio on 2003/03/21 18:12:55

	Fix a bug in the if-converter. This fix is filed against GCC
	as PR 10116 and is being tracked by FreeBSD PR 50059.
	Fix tested on i386 and ia64. Testing on Alpha is ongoing.
	Details on the bug can be found in the above mentioned PRs.

Affected files ...

.. //depot/projects/ia64/contrib/gcc/ifcvt.c#4 edit

Differences ...

==== //depot/projects/ia64/contrib/gcc/ifcvt.c#4 (text+ko) ====

@@ -1934,9 +1934,10 @@
      is more than one remaining edge, it must come from elsewhere.  There
      may be zero incoming edges if the THEN block didn't actually join 
      back up (as with a call to abort).  */
-  else if ((join_bb->pred == NULL
-	    || join_bb->pred->pred_next == NULL)
-	   && join_bb != EXIT_BLOCK_PTR)
+  else if ((join_bb->pred == NULL || join_bb->pred->pred_next == NULL)
+	   && join_bb != EXIT_BLOCK_PTR
+	   && (NEXT_INSN(combo_bb->end) == join_bb->head
+	       || GET_CODE(NEXT_INSN(combo_bb->end)) != CODE_LABEL))
     {
       /* We can merge the JOIN.  */
       if (life_data_ok)

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message