From 4bd09ee9d3c60db4f91248bc0f0c3d54dce2659a Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Mon, 21 Nov 2016 06:15:26 +0000 Subject: [PATCH] make replace_label_in_insn take labels as rtx_insn * gcc/ChangeLog: 2016-11-21 Trevor Saunders * rtl.h: Adjust prototype. * rtlanal.c (replace_label_in_insn): Change argument type to rtx_insn *. From-SVN: r242652 --- gcc/ChangeLog | 6 ++++++ gcc/rtl.h | 2 +- gcc/rtlanal.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b08f0813811..635f23c2e86 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-11-21 Trevor Saunders + + * rtl.h: Adjust prototype. + * rtlanal.c (replace_label_in_insn): Change argument type to + rtx_insn *. + 2016-11-21 Trevor Saunders * config/v850/v850.c (expand_prologue): Adjust. diff --git a/gcc/rtl.h b/gcc/rtl.h index 30a42fc1b6a..52e5d180fb6 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -3039,7 +3039,7 @@ extern void copy_reg_eh_region_note_backward (rtx, rtx_insn *, rtx); extern int inequality_comparisons_p (const_rtx); extern rtx replace_rtx (rtx, rtx, rtx, bool = false); extern void replace_label (rtx *, rtx, rtx, bool); -extern void replace_label_in_insn (rtx_insn *, rtx, rtx, bool); +extern void replace_label_in_insn (rtx_insn *, rtx_insn *, rtx_insn *, bool); extern bool rtx_referenced_p (const_rtx, const_rtx); extern bool tablejump_p (const rtx_insn *, rtx_insn **, rtx_jump_table_data **); extern int computed_jump_p (const rtx_insn *); diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c index 55a9d2cc509..403769efef1 100644 --- a/gcc/rtlanal.c +++ b/gcc/rtlanal.c @@ -3081,8 +3081,8 @@ replace_label (rtx *loc, rtx old_label, rtx new_label, bool update_label_nuses) } void -replace_label_in_insn (rtx_insn *insn, rtx old_label, rtx new_label, - bool update_label_nuses) +replace_label_in_insn (rtx_insn *insn, rtx_insn *old_label, + rtx_insn *new_label, bool update_label_nuses) { rtx insn_as_rtx = insn; replace_label (&insn_as_rtx, old_label, new_label, update_label_nuses);