re PR middle-end/66353 (Missing bb_has_abnormal_call_pred in basic-block.h)

	PR middle-end/66353
	* basic-block.h	(has_abnormal_call_or_eh_pred_edge_p): New function.
	* ira-lives.c (bb_has_abnormal_call_pred): Remove function.
	(process_bb_node_lives): Call has_abnormal_call_or_eh_pred_edge_p
	rather than bb_has_abnormal_call_pred.
	* lra-lives.c (bb_has_abnormal_call_pred): Remove function.
	(process_bb_lives): Call has_abnormal_call_or_eh_pred_edge_p
	rather than bb_has_abnormal_call_pred.

From-SVN: r225711

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e45616eceadb02bdd573b8f1364ea059274011ba..dd6155e583a13c2c7ac120fe3c1291f5ce283a20 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2015-07-11  Marek Polacek  <polacek@redhat.com>
+
+       PR middle-end/66353
+       * basic-block.h (has_abnormal_call_or_eh_pred_edge_p): New function.
+       * ira-lives.c (bb_has_abnormal_call_pred): Remove function.
+       (process_bb_node_lives): Call has_abnormal_call_or_eh_pred_edge_p
+       rather than bb_has_abnormal_call_pred.
+       * lra-lives.c (bb_has_abnormal_call_pred): Remove function.
+       (process_bb_lives): Call has_abnormal_call_or_eh_pred_edge_p
+       rather than bb_has_abnormal_call_pred.
+
 2015-07-10  Anatoly Sokolov  <aesok@post.ru>
 
        * config/v850/v850.h (REG_OK_FOR_BASE_P, REG_OK_FOR_INDEX_P,

diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 67555b2392c6cba403a526c934d16294feeae153..389ed9fcee70293b56a640a7b4941cd39e840fd8 100644 (file)
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -632,4 +632,21 @@ has_abnormal_or_eh_outgoing_edge_p (basic_block bb)
 
   return false;
 }
+
+/* Return true when one of the predecessor edges of BB is marked with
+   EDGE_ABNORMAL_CALL or EDGE_EH.  */
+
+static inline bool
+has_abnormal_call_or_eh_pred_edge_p (basic_block bb)
+{
+  edge e;
+  edge_iterator ei;
+
+  FOR_EACH_EDGE (e, ei, bb->preds)
+    if (e->flags & (EDGE_ABNORMAL_CALL | EDGE_EH))
+      return true;
+
+  return false;
+}
+
 #endif /* GCC_BASIC_BLOCK_H */

diff --git a/gcc/ira-lives.c b/gcc/ira-lives.c
index 7358f6760913e6b8f69c4ca34165bdcf83b709cf..1cb05c2b6db66f3099a47025b4af54fdca0ca1f3 100644 (file)
--- a/gcc/ira-lives.c
+++ b/gcc/ira-lives.c
@@ -968,22 +968,6 @@ process_single_reg_class_operands (bool in_p, int freq)
     }
 }
 
-/* Return true when one of the predecessor edges of BB is marked with
-   EDGE_ABNORMAL_CALL or EDGE_EH.  */
-static bool
-bb_has_abnormal_call_pred (basic_block bb)
-{
-  edge e;
-  edge_iterator ei;
-
-  FOR_EACH_EDGE (e, ei, bb->preds)
-    {
-      if (e->flags & (EDGE_ABNORMAL_CALL | EDGE_EH))
-       return true;
-    }
-  return false;
-}
-
 /* Look through the CALL_INSN_FUNCTION_USAGE of a call insn INSN, and see if
    we find a SET rtx that we can use to deduce that a register can be cheaply
    caller-saved.  Return such a register, or NULL_RTX if none is found.  */
@@ -1343,7 +1327,8 @@ process_bb_node_lives (ira_loop_tree_node_t loop_tree_node)
          /* No need to record conflicts for call clobbered regs if we
             have nonlocal labels around, as we don't ever try to
             allocate such regs in this case.  */
-         if (!cfun->has_nonlocal_label && bb_has_abnormal_call_pred (bb))
+         if (!cfun->has_nonlocal_label
+             && has_abnormal_call_or_eh_pred_edge_p (bb))
            for (px = 0; px < FIRST_PSEUDO_REGISTER; px++)
              if (call_used_regs[px]
 #ifdef REAL_PIC_OFFSET_TABLE_REGNUM

diff --git a/gcc/lra-lives.c b/gcc/lra-lives.c
index 8b8636875642b8beec19ba118acb94d033ab8a6d..322b3bf6551bdfc96dd2982a54a2a5cc15d1bfe6 100644 (file)
--- a/gcc/lra-lives.c
+++ b/gcc/lra-lives.c
@@ -508,22 +508,6 @@ static lra_insn_recog_data_t curr_id;
 /* The insn static data.  */
 static struct lra_static_insn_data *curr_static_id;
 
-/* Return true when one of the predecessor edges of BB is marked with
-   EDGE_ABNORMAL_CALL or EDGE_EH.  */
-static bool
-bb_has_abnormal_call_pred (basic_block bb)
-{
-  edge e;
-  edge_iterator ei;
-
-  FOR_EACH_EDGE (e, ei, bb->preds)
-    {
-      if (e->flags & (EDGE_ABNORMAL_CALL | EDGE_EH))
-       return true;
-    }
-  return false;
-}
-
 /* Vec containing execution frequencies of program points.  */
 static vec<int> point_freq_vec;
 
@@ -965,7 +949,8 @@ process_bb_lives (basic_block bb, int &curr_point, bool dead_insn_p)
       /* No need to record conflicts for call clobbered regs if we
         have nonlocal labels around, as we don't ever try to
         allocate such regs in this case.  */
-      if (!cfun->has_nonlocal_label && bb_has_abnormal_call_pred (bb))
+      if (!cfun->has_nonlocal_label
+         && has_abnormal_call_or_eh_pred_edge_p (bb))
        for (px = 0; px < FIRST_PSEUDO_REGISTER; px++)
          if (call_used_regs[px]
 #ifdef REAL_PIC_OFFSET_TABLE_REGNUM