* ifcvt.c (find_if_case_1): Revert 2005-01-04 change.

From-SVN: r92970

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7797ffc5f4743eca2ca88fc1a6f6037a9e630bf6..d7ec1d39ee9c031455b366044da1603677cd8e4b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-05  Roger Sayle  <roger@eyesopen.com>
+
+       * ifcvt.c (find_if_case_1): Revert 2005-01-04 change.
+
 2005-01-05  Jan Hubicka  <jh@suse.cz>
            Richard Henderson  <rth@redhat.com>
 

diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 75932b37e46e07173a81902537fefa5cff20ad52..98fbd667a01ac2dca65c09259a75ae4e41487000 100644 (file)
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -2927,21 +2927,7 @@ find_if_case_1 (basic_block test_bb, edge then_edge, edge else_edge)
              else_bb->global_live_at_start,
              then_bb->global_live_at_end);
 
-
-  /* We can avoid creating a new basic block if then_bb is immediately
-     followed by else_bb, i.e. deleting then_bb allows test_bb to fall
-     thru to else_bb.  */
-
-  if (then_bb->next_bb == else_bb
-      && then_bb->prev_bb == test_bb)
-    {
-      redirect_edge_succ (FALLTHRU_EDGE (test_bb), else_bb);
-      new_bb = 0;
-    }
-  else
-    new_bb = redirect_edge_and_branch_force (FALLTHRU_EDGE (test_bb),
-                                             else_bb);
-
+  new_bb = redirect_edge_and_branch_force (FALLTHRU_EDGE (test_bb), else_bb);
   then_bb_index = then_bb->index;
   delete_basic_block (then_bb);