@@ -5856,7 +5856,7 @@ pass_expand::execute (function *fun)
{
if (e->insns.r)
{
- rebuild_jump_labels_chain (e->insns.r);
+ rebuild_jump_labels_chain (as_a <rtx_insn *> (e->insns.r));
/* Put insns after parm birth, but before
NOTE_INSNS_FUNCTION_BEG. */
if (e->src == ENTRY_BLOCK_PTR_FOR_FN (fun)
@@ -62,8 +62,8 @@ along with GCC; see the file COPYING3. If not see
or even change what is live at any point.
So perhaps let combiner do it. */
-static void init_label_info (rtx);
-static void mark_all_labels (rtx);
+static void init_label_info (rtx_insn *);
+static void mark_all_labels (rtx_insn *);
static void mark_jump_label_1 (rtx, rtx, bool, bool);
static void mark_jump_label_asm (rtx, rtx);
static void redirect_exp_1 (rtx *, rtx, rtx, rtx);
@@ -72,7 +72,7 @@ static int returnjump_p_1 (rtx *, void *);
/* Worker for rebuild_jump_labels and rebuild_jump_labels_chain. */
static void
-rebuild_jump_labels_1 (rtx f, bool count_forced)
+rebuild_jump_labels_1 (rtx_insn *f, bool count_forced)
{
rtx insn;
@@ -96,7 +96,7 @@ rebuild_jump_labels_1 (rtx f, bool count_forced)
instructions and jumping insns that have labels as operands
(e.g. cbranchsi4). */
void
-rebuild_jump_labels (rtx f)
+rebuild_jump_labels (rtx_insn *f)
{
rebuild_jump_labels_1 (f, true);
}
@@ -105,7 +105,7 @@ rebuild_jump_labels (rtx f)
forced_labels. It can be used on insn chains that aren't the
main function chain. */
void
-rebuild_jump_labels_chain (rtx chain)
+rebuild_jump_labels_chain (rtx_insn *chain)
{
rebuild_jump_labels_1 (chain, false);
}
@@ -121,7 +121,7 @@ rebuild_jump_labels_chain (rtx chain)
static unsigned int
cleanup_barriers (void)
{
- rtx insn, next, prev;
+ rtx_insn *insn, *next, *prev;
for (insn = get_insns (); insn; insn = next)
{
next = NEXT_INSN (insn);
@@ -181,9 +181,9 @@ make_pass_cleanup_barriers (gcc::context *ctxt)
notes whose labels don't occur in the insn any more. */
static void
-init_label_info (rtx f)
+init_label_info (rtx_insn *f)
{
- rtx insn;
+ rtx_insn *insn;
for (insn = f; insn; insn = NEXT_INSN (insn))
{
@@ -219,7 +219,7 @@ init_label_info (rtx f)
load into a jump_insn that uses it. */
static void
-maybe_propagate_label_ref (rtx jump_insn, rtx prev_nonjump_insn)
+maybe_propagate_label_ref (rtx_insn *jump_insn, rtx_insn *prev_nonjump_insn)
{
rtx label_note, pc, pc_src;
@@ -267,9 +267,9 @@ maybe_propagate_label_ref (rtx jump_insn, rtx prev_nonjump_insn)
Combine consecutive labels, and count uses of labels. */
static void
-mark_all_labels (rtx f)
+mark_all_labels (rtx_insn *f)
{
- rtx insn;
+ rtx_insn *insn;
if (current_ir_type () == IR_RTL_CFGLAYOUT)
{
@@ -299,7 +299,7 @@ mark_all_labels (rtx f)
}
else
{
- rtx prev_nonjump_insn = NULL;
+ rtx_insn *prev_nonjump_insn = NULL;
for (insn = f; insn; insn = NEXT_INSN (insn))
{
if (INSN_DELETED_P (insn))
@@ -3029,8 +3029,8 @@ extern unsigned int reg_or_subregno (const_rtx);
extern int redirect_jump_1 (rtx, rtx);
extern void redirect_jump_2 (rtx, rtx, rtx, int, int);
extern int redirect_jump (rtx, rtx, int);
-extern void rebuild_jump_labels (rtx);
-extern void rebuild_jump_labels_chain (rtx);
+extern void rebuild_jump_labels (rtx_insn *);
+extern void rebuild_jump_labels_chain (rtx_insn *);
extern rtx reversed_comparison (const_rtx, enum machine_mode);
extern enum rtx_code reversed_comparison_code (const_rtx, const_rtx);
extern enum rtx_code reversed_comparison_code_parts (enum rtx_code, const_rtx,