diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/sh/sh.md | 3 | ||||
| -rw-r--r-- | gcc/dwarf2out.c | 2 | ||||
| -rw-r--r-- | gcc/emit-rtl.c | 4 | ||||
| -rw-r--r-- | gcc/rtl.h | 2 |
5 files changed, 12 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7d11126..7576a1e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 2016-09-22 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> + * emit-rtl.c (prev_real_insn): Change argument type to rtx_insn *. + * rtl.h: Adjust prototype. + * config/sh/sh.md: Adjust. + * dwarf2out.c (add_var_loc_to_decl): Likewise. + +2016-09-22 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> + * emit-rtl.c (next_nondebug_insn): Change argument type to rtx_insn *. (prev_nondebug_insn): Likewise. diff --git a/gcc/config/sh/sh.md b/gcc/config/sh/sh.md index edc4d15..25e03ef 100644 --- a/gcc/config/sh/sh.md +++ b/gcc/config/sh/sh.md @@ -7178,7 +7178,8 @@ (label_ref (match_operand 1 "" "")))) (use (label_ref (match_operand 2 "" "")))] "TARGET_SH2 - && (! INSN_UID (operands[1]) || prev_real_insn (operands[1]) == insn)" + && (! INSN_UID (operands[1]) + || prev_real_insn (as_a<rtx_insn *> (operands[1])) == insn)" "braf %0%#" [(set_attr "needs_delay_slot" "yes") (set_attr "type" "jump_ind")]) diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 4e4893f..e36473a 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -5415,7 +5415,7 @@ add_var_loc_to_decl (tree decl, rtx loc_note, const char *label) && NOTE_VAR_LOCATION_LOC (temp->first->loc) && GET_CODE (NOTE_VAR_LOCATION_LOC (temp->first->loc)) == GET_CODE (DECL_INCOMING_RTL (decl)) - && prev_real_insn (temp->first->loc) == NULL_RTX + && prev_real_insn (as_a<rtx_insn *> (temp->first->loc)) == NULL_RTX && (bitsize != -1 || !rtx_equal_p (NOTE_VAR_LOCATION_LOC (temp->first->loc), NOTE_VAR_LOCATION_LOC (loc_note)) diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index c24717b..0fc0a67 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -3461,10 +3461,8 @@ next_real_insn (rtx uncast_insn) SEQUENCEs. */ rtx_insn * -prev_real_insn (rtx uncast_insn) +prev_real_insn (rtx_insn *insn) { - rtx_insn *insn = safe_as_a <rtx_insn *> (uncast_insn); - while (insn) { insn = PREV_INSN (insn); @@ -2842,7 +2842,7 @@ extern rtx_insn *prev_nondebug_insn (rtx_insn *); extern rtx_insn *next_nondebug_insn (rtx_insn *); extern rtx_insn *prev_nonnote_nondebug_insn (rtx); extern rtx_insn *next_nonnote_nondebug_insn (rtx); -extern rtx_insn *prev_real_insn (rtx); +extern rtx_insn *prev_real_insn (rtx_insn *); extern rtx_insn *next_real_insn (rtx); extern rtx_insn *prev_active_insn (rtx); extern rtx_insn *next_active_insn (rtx); |