gcc/ * basic-block.h (create_basic_block_structure): Strengthen params 1 "head" and 2 "end" from rtx to rtx_insn *. * cfgrtl.c (create_basic_block_structure): Likewise. (rtl_create_basic_block): Update casts from void * to rtx to rtx_insn *, so that we can pass them as rtx_insn * to create_basic_block_structure. * sel-sched-ir.c (sel_create_basic_block): Likewise. --- gcc/basic-block.h | 4 ++-- gcc/cfgrtl.c | 5 +++-- gcc/sel-sched-ir.c | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/gcc/basic-block.h b/gcc/basic-block.h index 8d1c924..5b2af29 100644 --- a/gcc/basic-block.h +++ b/gcc/basic-block.h @@ -411,8 +411,8 @@ extern void remove_edge_raw (edge); extern void redirect_edge_succ (edge, basic_block); extern edge redirect_edge_succ_nodup (edge, basic_block); extern void redirect_edge_pred (edge, basic_block); -extern basic_block create_basic_block_structure (rtx, rtx, rtx_note *, - basic_block); +extern basic_block create_basic_block_structure (rtx_insn *, rtx_insn *, + rtx_note *, basic_block); extern void clear_bb_flags (void); extern void dump_bb_info (FILE *, basic_block, int, int, bool, bool); extern void dump_edge_info (FILE *, edge, int, int); diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index e8990c4..1949aff 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -271,7 +271,7 @@ delete_insn_chain (rtx start, rtx finish, bool clear_bb) AFTER is the basic block we should be put after. */ basic_block -create_basic_block_structure (rtx head, rtx end, rtx_note *bb_note, +create_basic_block_structure (rtx_insn *head, rtx_insn *end, rtx_note *bb_note, basic_block after) { basic_block bb; @@ -351,7 +351,8 @@ create_basic_block_structure (rtx head, rtx end, rtx_note *bb_note, static basic_block rtl_create_basic_block (void *headp, void *endp, basic_block after) { - rtx head = (rtx) headp, end = (rtx) endp; + rtx_insn *head = (rtx_insn *) headp; + rtx_insn *end = (rtx_insn *) endp; basic_block bb; /* Grow the basic block array if needed. */ diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c index a996cc8..8fc1b1a 100644 --- a/gcc/sel-sched-ir.c +++ b/gcc/sel-sched-ir.c @@ -5363,7 +5363,8 @@ sel_create_basic_block (void *headp, void *endp, basic_block after) new_bb = orig_cfg_hooks.create_basic_block (headp, endp, after); else { - new_bb = create_basic_block_structure ((rtx) headp, (rtx) endp, + new_bb = create_basic_block_structure ((rtx_insn *) headp, + (rtx_insn *) endp, new_bb_note, after); new_bb->aux = NULL; } -- 1.8.5.3