From 3bbd58151e8b45501da6b011f9607be86a963bed Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Thu, 21 Aug 2014 20:57:56 +0000 Subject: [PATCH] cfgbuild.c: Use rtx_insn gcc/ 2014-08-21 David Malcolm * cfgbuild.c (make_edges): Strengthen local "insn" from rtx to rtx_insn *. (purge_dead_tablejump_edges): Likewise. (find_bb_boundaries): Likewise for locals "insn", "end", "flow_transfer_insn". From-SVN: r214291 --- gcc/ChangeLog | 8 ++++++++ gcc/cfgbuild.c | 14 ++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f2e58e51b6e..374d7187997 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2014-08-21 David Malcolm + + * cfgbuild.c (make_edges): Strengthen local "insn" from rtx to + rtx_insn *. + (purge_dead_tablejump_edges): Likewise. + (find_bb_boundaries): Likewise for locals "insn", "end", + "flow_transfer_insn". + 2014-08-21 David Malcolm * caller-save.c (save_call_clobbered_regs): Strengthen locals diff --git a/gcc/cfgbuild.c b/gcc/cfgbuild.c index 848e13f51ab..8bbf3259892 100644 --- a/gcc/cfgbuild.c +++ b/gcc/cfgbuild.c @@ -218,7 +218,8 @@ make_edges (basic_block min, basic_block max, int update_p) FOR_BB_BETWEEN (bb, min, max->next_bb, next_bb) { - rtx insn, x; + rtx_insn *insn; + rtx x; enum rtx_code code; edge e; edge_iterator ei; @@ -399,7 +400,8 @@ mark_tablejump_edge (rtx label) static void purge_dead_tablejump_edges (basic_block bb, rtx table) { - rtx insn = BB_END (bb), tmp; + rtx_insn *insn = BB_END (bb); + rtx tmp; rtvec vec; int j; edge_iterator ei; @@ -443,10 +445,10 @@ static void find_bb_boundaries (basic_block bb) { basic_block orig_bb = bb; - rtx insn = BB_HEAD (bb); - rtx end = BB_END (bb), x; + rtx_insn *insn = BB_HEAD (bb); + rtx_insn *end = BB_END (bb), *x; rtx_jump_table_data *table; - rtx flow_transfer_insn = NULL_RTX; + rtx_insn *flow_transfer_insn = NULL; edge fallthru = NULL; if (insn == BB_END (bb)) @@ -480,7 +482,7 @@ find_bb_boundaries (basic_block bb) bb = fallthru->dest; remove_edge (fallthru); - flow_transfer_insn = NULL_RTX; + flow_transfer_insn = NULL; if (code == CODE_LABEL && LABEL_ALT_ENTRY_P (insn)) make_edge (ENTRY_BLOCK_PTR_FOR_FN (cfun), bb, 0); }