change in_expr_list_p to in_insn_list_p

gcc/ChangeLog:

2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* rtlanal.c (in_insn_list_p): Renamed from in_expr_list_p.
	* cfgrtl.c (can_delete_label_p): Adjust.
	* rtl.h: likewise.

From-SVN: r222938

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f4b88d36326f8231ce2b4e9189a973ba9d74a177..94783f8091f88cca5bcb4b147b1183251fe0e790 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+       * rtlanal.c (in_insn_list_p): Renamed from in_expr_list_p.
+       * cfgrtl.c (can_delete_label_p): Adjust.
+       * rtl.h: likewise.
+
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
        * reorg.c (stop_search_p): Change argument to rtx_insn *.

diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 8a750448866a9a670330be1451e4271c53e65747..390d7185b46b8195b939d3810a9251ded4e79478 100644 (file)
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -145,7 +145,7 @@ can_delete_label_p (const rtx_code_label *label)
   return (!LABEL_PRESERVE_P (label)
          /* User declared labels must be preserved.  */
          && LABEL_NAME (label) == 0
-         && !in_expr_list_p (forced_labels, label));
+         && !in_insn_list_p (forced_labels, label));
 }
 
 /* Delete INSN by patching it out.  */

diff --git a/gcc/rtl.h b/gcc/rtl.h
index 273e2d56274e6a9e977be98509fc4efe53effc3d..6b01dd7c146ec5ada0a27cf20a2e6a3a89f9d055 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2922,7 +2922,7 @@ extern unsigned hash_rtx_cb (const_rtx, machine_mode, int *, int *,
 
 extern rtx regno_use_in (unsigned int, rtx);
 extern int auto_inc_p (const_rtx);
-extern int in_expr_list_p (const_rtx, const_rtx);
+extern bool in_insn_list_p (const rtx_insn_list *, const rtx_insn *);
 extern void remove_node_from_expr_list (const_rtx, rtx_expr_list **);
 extern void remove_node_from_insn_list (const rtx_insn *, rtx_insn_list **);
 extern int loc_mentioned_in_p (rtx *, const_rtx);

diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 2377f25ac88714afed67c67b82517d587eac4dda..b5310103f1fb9204facdf7fd3e971361f5a95b7e 100644 (file)
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -2205,16 +2205,16 @@ remove_reg_equal_equiv_notes_for_regno (unsigned int regno)
    return 1 if it is found.  A simple equality test is used to determine if
    NODE matches.  */
 
-int
-in_expr_list_p (const_rtx listp, const_rtx node)
+bool
+in_insn_list_p (const rtx_insn_list *listp, const rtx_insn *node)
 {
   const_rtx x;
 
   for (x = listp; x; x = XEXP (x, 1))
     if (node == XEXP (x, 0))
-      return 1;
+      return true;
 
-  return 0;
+  return false;
 }
 
 /* Search LISTP (an EXPR_LIST) for an entry whose first operand is NODE and