diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a6502dda463..d9e57b0c875 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 fafff9d0925..17d26c583c7 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;