From e5b51ca02b275b9dbc2094499750bfb16a6b0e18 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 5 Sep 2014 01:14:41 +0000 Subject: [PATCH] fixup_args_size_notes takes a pair of rtx_insn gcc/ 2014-09-05 David Malcolm * emit-rtl.c (try_split): Update NULL_RTX to NULL in call to fixup_args_size_notes. * expr.c (fixup_args_size_notes): Strengthen first two params from rtx to rtx_insn *, eliminating a checked cast. * rtl.h (fixup_args_size_notes): Strengthen first two params from rtx to rtx_insn *. From-SVN: r214930 --- gcc/ChangeLog | 9 +++++++++ gcc/emit-rtl.c | 2 +- gcc/expr.c | 3 +-- gcc/rtl.h | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 706e989d88b..f4b506d1d3a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2014-09-05 David Malcolm + + * emit-rtl.c (try_split): Update NULL_RTX to NULL in call to + fixup_args_size_notes. + * expr.c (fixup_args_size_notes): Strengthen first two params from + rtx to rtx_insn *, eliminating a checked cast. + * rtl.h (fixup_args_size_notes): Strengthen first two params from + rtx to rtx_insn *. + 2014-09-05 David Malcolm * haifa-sched.c (get_ready_element): Strengthen return type from diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index fdd2f94a0bb..a6b12a4cc06 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -3756,7 +3756,7 @@ try_split (rtx pat, rtx uncast_trial, int last) #endif case REG_ARGS_SIZE: - fixup_args_size_notes (NULL_RTX, insn_last, INTVAL (XEXP (note, 0))); + fixup_args_size_notes (NULL, insn_last, INTVAL (XEXP (note, 0))); break; case REG_CALL_DECL: diff --git a/gcc/expr.c b/gcc/expr.c index e7a7c16a0cb..7e69955afbb 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -3953,9 +3953,8 @@ find_args_size_adjust (rtx insn) } int -fixup_args_size_notes (rtx prev, rtx uncast_last, int end_args_size) +fixup_args_size_notes (rtx_insn *prev, rtx_insn *last, int end_args_size) { - rtx_insn *last = safe_as_a (uncast_last); int args_size = end_args_size; bool saw_unknown = false; rtx_insn *insn; diff --git a/gcc/rtl.h b/gcc/rtl.h index 70af1cfa90f..23419764f9b 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -3363,7 +3363,7 @@ extern void emit_jump (rtx); extern rtx move_by_pieces (rtx, rtx, unsigned HOST_WIDE_INT, unsigned int, int); extern HOST_WIDE_INT find_args_size_adjust (rtx); -extern int fixup_args_size_notes (rtx, rtx, int); +extern int fixup_args_size_notes (rtx_insn *, rtx_insn *, int); /* In cfgrtl.c */ extern void print_rtl_with_bb (FILE *, const rtx_insn *, int); -- 2.30.2