From: Richard Henderson <rth@redhat.com>
Date: Sun, 15 Jul 2001 00:00:56 +0000 (-0700)
Subject: * ifcvt.c (find_cond_trap): Test for exit block.
X-Git-Tag: prereleases/libstdc++-3.0.95~3282
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35cbdf6fefe1ceb2b824856874337b7ee47662e5;p=thirdparty%2Fgcc.git

* ifcvt.c (find_cond_trap): Test for exit block.

From-SVN: r44009
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc4cfcffeda5..1d9c94dab2fb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-14  Richard Henderson  <rth@redhat.com>
+
+	* ifcvt.c (find_cond_trap): Test for exit block.
+
 Sun Jul 15 00:50:20 CEST 2001  Jan Hubicka  <jh@suse.cz>
 
 	Re-install recently reverted patch.
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 6196522d228e..d23fd3a76825 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -2018,6 +2018,11 @@ find_cond_trap (test_bb, then_edge, else_edge)
   else
     return FALSE;
 
+  /* Don't confuse a conditional return with something we want to
+     optimize here.  */
+  if (trap_bb == EXIT_BLOCK_PTR)
+    return FALSE;
+
   /* The only instruction in the THEN block must be the trap.  */
   trap = first_active_insn (trap_bb);
   if (! (trap == trap_bb->end