From owner-p4-projects@FreeBSD.ORG  Sat Apr  5 20:02:14 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B3E3637B404; Sat,  5 Apr 2003 20:02:13 -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 69BB037B401
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 20:02:13 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0F31443F93
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 20:02:13 -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 h3642C0U064258
	for <perforce@freebsd.org>; Sat, 5 Apr 2003 20:02:12 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3642C2q064255
	for perforce@freebsd.org; Sat, 5 Apr 2003 20:02:12 -0800 (PST)
Date: Sat, 5 Apr 2003 20:02:12 -0800 (PST)
Message-Id: <200304060402.h3642C2q064255@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28289 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Apr 2003 04:02:15 -0000

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

Change 28289 by marcel@marcel_nfs on 2003/04/05 20:01:58

	Replace my homegrown GCC patch with the real thing (as
	committed to the GCC trees).

Affected files ...

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

Differences ...

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

@@ -1934,10 +1934,9 @@
      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
-	   && (NEXT_INSN(combo_bb->end) == join_bb->head
-	       || GET_CODE(NEXT_INSN(combo_bb->end)) != CODE_LABEL))
+  else if ((join_bb->pred == NULL
+	    || join_bb->pred->pred_next == NULL)
+	   && join_bb != EXIT_BLOCK_PTR)
     {
       /* We can merge the JOIN.  */
       if (life_data_ok)
@@ -2046,7 +2045,8 @@
   /* The THEN block of an IF-THEN combo must have zero or one successors.  */
   if (then_succ != NULL_EDGE
       && (then_succ->succ_next != NULL_EDGE
-          || (then_succ->flags & EDGE_COMPLEX)))
+          || (then_succ->flags & EDGE_COMPLEX)
+	  || (flow2_completed && tablejump_p (then_bb->end))))
     return FALSE;
 
   /* If the THEN block has no successors, conditional execution can still
@@ -2093,7 +2093,8 @@
 	   && then_succ->dest == else_succ->dest
 	   && else_bb->pred->pred_next == NULL_EDGE
 	   && else_succ->succ_next == NULL_EDGE
-	   && ! (else_succ->flags & EDGE_COMPLEX))
+	   && ! (else_succ->flags & EDGE_COMPLEX)
+	   && ! (flow2_completed && tablejump_p (else_bb->end)))
     join_bb = else_succ->dest;
 
   /* Otherwise it is not an IF-THEN or IF-THEN-ELSE combination.  */