aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/tree-cfg.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3e31b8d..e6777c8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-17 Kazu Hirata <kazu@cs.umass.edu>
+
+ * tree-cfg.c (tree_can_merge_blocks_p): Reorder two checks.
+
2005-01-17 Ian Lance Taylor <ian@airs.com>
PR middle-end/13127:
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index a68c964..14c901d 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -1217,12 +1217,12 @@ tree_can_merge_blocks_p (basic_block a, basic_block b)
if (EDGE_SUCC (a, 0)->dest != b)
return false;
- if (b == EXIT_BLOCK_PTR)
- return false;
-
if (EDGE_COUNT (b->preds) > 1)
return false;
+ if (b == EXIT_BLOCK_PTR)
+ return false;
+
/* If A ends by a statement causing exceptions or something similar, we
cannot merge the blocks. */
stmt = last_stmt (a);