From 26e752144dbe4c3dcb9c4ac8be39b93beef6663e Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Mon, 17 Jan 2005 18:40:47 +0000 Subject: [PATCH] * tree-cfg.c (tree_can_merge_blocks_p): Reorder two checks. From-SVN: r93767 --- gcc/ChangeLog | 4 ++++ gcc/tree-cfg.c | 6 +++--- 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 + + * tree-cfg.c (tree_can_merge_blocks_p): Reorder two checks. + 2005-01-17 Ian Lance Taylor 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); -- 2.7.4