From: Kazu Hirata <kazu@cs.umass.edu>
Date: Mon, 17 Jan 2005 18:40:47 +0000 (+0000)
Subject: * tree-cfg.c (tree_can_merge_blocks_p): Reorder two checks.
X-Git-Tag: releases/gcc-4.0.0~1509
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26e752144dbe4c3dcb9c4ac8be39b93beef6663e;p=thirdparty%2Fgcc.git

* tree-cfg.c (tree_can_merge_blocks_p): Reorder two checks.

From-SVN: r93767
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3e31b8dfa1fc..e6777c8e0170 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 a68c964c0c86..14c901ddf75c 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);