ipa-split.c (find_return_bb): Use single_pred_p/single_pred_edge, simplify.

	* ipa-split.c (find_return_bb): Use single_pred_p/single_pred_edge,
	simplify.

From-SVN: r169020

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 50372d8ab842030cb61cd30b5bdf46977a26785e..8020abe86805321995482bf223f4487f135158ed 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2011-01-19  Jakub Jelinek  <jakub@redhat.com>
 
+       * ipa-split.c (find_return_bb): Use single_pred_p/single_pred_edge,
+       simplify.
+
        * ipa-split.c: Spelling fixes.
 
 2011-01-19  Richard Henderson  <rth@redhat.com>

diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index d5bf35fcc27e018097cc346f4c80759e159040e3..c72a36d67ee872febfc2a9afd1c62db250010b5a 100644 (file)
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -496,47 +496,39 @@ static basic_block
 find_return_bb (void)
 {
   edge e;
-  edge_iterator ei;
   basic_block return_bb = EXIT_BLOCK_PTR;
+  gimple_stmt_iterator bsi;
+  bool found_return = false;
+  tree retval = NULL_TREE;
 
-  if (EDGE_COUNT (EXIT_BLOCK_PTR->preds) == 1)
-    FOR_EACH_EDGE (e, ei, EXIT_BLOCK_PTR->preds)
-      {
-       gimple_stmt_iterator bsi;
-       bool found_return = false;
-       tree retval = NULL_TREE;
+  if (!single_pred_p (EXIT_BLOCK_PTR))
+    return return_bb;
+
+  e = single_pred_edge (EXIT_BLOCK_PTR);
+  for (bsi = gsi_last_bb (e->src); !gsi_end_p (bsi); gsi_prev (&bsi))
+    {
+      gimple stmt = gsi_stmt (bsi);
+      if (gimple_code (stmt) == GIMPLE_LABEL || is_gimple_debug (stmt))
+       ;
+      else if (gimple_code (stmt) == GIMPLE_ASSIGN
+              && found_return
+              && gimple_assign_single_p (stmt)
+              && (auto_var_in_fn_p (gimple_assign_rhs1 (stmt),
+                                    current_function_decl)
+                  || is_gimple_min_invariant (gimple_assign_rhs1 (stmt)))
+              && retval == gimple_assign_lhs (stmt))
+       ;
+      else if (gimple_code (stmt) == GIMPLE_RETURN)
+       {
+         found_return = true;
+         retval = gimple_return_retval (stmt);
+       }
+      else
+       break;
+    }
+  if (gsi_end_p (bsi) && found_return)
+    return_bb = e->src;
 
-       for (bsi = gsi_last_bb (e->src); !gsi_end_p (bsi); gsi_prev (&bsi))
-         {
-           gimple stmt = gsi_stmt (bsi);
-           if (gimple_code (stmt) == GIMPLE_LABEL
-               || is_gimple_debug (stmt))
-             ;
-           else if (gimple_code (stmt) == GIMPLE_ASSIGN
-                    && found_return
-                    && gimple_assign_single_p (stmt)
-                    && (auto_var_in_fn_p (gimple_assign_rhs1 (stmt),
-                                          current_function_decl)
-                        || is_gimple_min_invariant
-                             (gimple_assign_rhs1 (stmt)))
-                    && retval == gimple_assign_lhs (stmt))
-             ;
-           else if (gimple_code (stmt) == GIMPLE_RETURN)
-             {
-               found_return = true;
-               retval = gimple_return_retval (stmt);
-             }
-           else
-             break;
-         }
-       if (gsi_end_p (bsi) && found_return)
-         {
-           if (retval)
-             return e->src;
-           else
-             return_bb = e->src;
-         }
-      }
   return return_bb;
 }