From 64e72baf090e5f3343da8e48c7316e41285d4c29 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Fri, 29 Aug 2014 00:14:43 +0000 Subject: [PATCH] Strengthen params to active_insn_between gcc/ 2014-08-28 David Malcolm * shrink-wrap.h (active_insn_between): Strengthen both params from rtx to rtx_insn *. * function.c (active_insn_between): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@214704 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/function.c | 3 +-- gcc/shrink-wrap.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 470d0d32152..83b959a4bcb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2014-08-28 David Malcolm + * shrink-wrap.h (active_insn_between): Strengthen both params from + rtx to rtx_insn *. + * function.c (active_insn_between): Likewise. + +2014-08-28 David Malcolm + * genattr.c (main): When writing out insn-attr.h, strengthen param of dfa_clear_single_insn_cache from rtx to rtx_insn *. * genautomata.c (output_dfa_clean_insn_cache_func): Likewise when diff --git a/gcc/function.c b/gcc/function.c index 54fb9b4b11b..dc9c06b3166 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -5426,9 +5426,8 @@ set_return_jump_label (rtx returnjump) #if defined (HAVE_return) || defined (HAVE_simple_return) /* Return true if there are any active insns between HEAD and TAIL. */ bool -active_insn_between (rtx head, rtx uncast_tail) +active_insn_between (rtx_insn *head, rtx_insn *tail) { - rtx_insn *tail = safe_as_a (uncast_tail); while (tail) { if (active_insn_p (tail)) diff --git a/gcc/shrink-wrap.h b/gcc/shrink-wrap.h index 647c0769fc9..29bdcfd4ef2 100644 --- a/gcc/shrink-wrap.h +++ b/gcc/shrink-wrap.h @@ -27,7 +27,7 @@ along with GCC; see the file COPYING3. If not see #ifdef HAVE_simple_return /* In function.c. */ extern void emit_return_into_block (bool simple_p, basic_block bb); -extern bool active_insn_between (rtx head, rtx tail); +extern bool active_insn_between (rtx_insn *head, rtx_insn *tail); extern vec convert_jumps_to_returns (basic_block last_bb, bool simple_p, vec unconverted); extern basic_block emit_return_for_exit (edge exit_fallthru_edge, -- 2.11.4.GIT