aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Sayle <roger@eyesopen.com>2005-01-05 21:13:08 +0000
committerRoger Sayle <sayle@gcc.gnu.org>2005-01-05 21:13:08 +0000
commit65a878f5db97c74ee215011e1e2411fdc506be8c (patch)
tree368573f529c038d789626dc4549e9a6e4d8054ec
parentea97f102ef78054ce0b11ee31fddc628b01b4d4a (diff)
downloadgcc-65a878f5db97c74ee215011e1e2411fdc506be8c.zip
gcc-65a878f5db97c74ee215011e1e2411fdc506be8c.tar.gz
gcc-65a878f5db97c74ee215011e1e2411fdc506be8c.tar.bz2
* ifcvt.c (find_if_case_1): Revert 2005-01-04 change.
From-SVN: r92970
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/ifcvt.c16
2 files changed, 5 insertions, 15 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7797ffc..d7ec1d3 100644
--- 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 75932b3..98fbd66 100644
--- 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);