From: Jeff Law <law@redhat.com>
Date: Fri, 15 Nov 2013 18:14:10 +0000 (-0700)
Subject: ifcvt.c (find_cond_trap): Properly handle case where trap_bb == else_bb.
X-Git-Tag: releases/gcc-4.9.0~2754
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0d3309e9b5700f73d88c01193eb701a2f4ef985;p=thirdparty%2Fgcc.git

ifcvt.c (find_cond_trap): Properly handle case where trap_bb == else_bb.

	* ifcvt.c (find_cond_trap): Properly handle case where
	trap_bb == else_bb.

From-SVN: r204856
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a6502dda4636..d9e57b0c875a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-15  Jeff Law  <law@redhat.com>
+
+	* ifcvt.c (find_cond_trap): Properly handle case where
+	trap_bb == else_bb.
+
 2013-11-15  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* configure: Regenerate.
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index fafff9d09255..17d26c583c75 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -3694,7 +3694,7 @@ find_cond_trap (basic_block test_bb, edge then_edge, edge else_edge)
   /* Wire together the blocks again.  */
   if (current_ir_type () == IR_RTL_CFGLAYOUT)
     single_succ_edge (test_bb)->flags |= EDGE_FALLTHRU;
-  else
+  else if (trap_bb == then_bb)
     {
       rtx lab, newjump;