From 0d53e74ecf0d43d2e80a29d1252a18f29cbc899e Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Sat, 9 May 2015 04:15:52 +0000 Subject: [PATCH] change in_expr_list_p to in_insn_list_p gcc/ChangeLog: 2015-05-08 Trevor Saunders * 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 --- gcc/ChangeLog | 6 ++++++ gcc/cfgrtl.c | 2 +- gcc/rtl.h | 2 +- gcc/rtlanal.c | 8 ++++---- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f4b88d36326..94783f8091f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-05-08 Trevor Saunders + + * 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 * reorg.c (stop_search_p): Change argument to rtx_insn *. diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index 8a750448866..390d7185b46 100644 --- 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 273e2d56274..6b01dd7c146 100644 --- 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 2377f25ac88..b5310103f1f 100644 --- 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 -- 2.30.2