From a684cb043a394d7a57a65738413e75e5a102dc29 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Mon, 18 Aug 2014 20:48:17 +0000 Subject: Split BB_HEAD et al into BB_HEAD/SET_BB_HEAD variants gcc/ 2014-08-18 David Malcolm * basic-block.h (BB_HEAD): Split macro in two: the existing one, for rvalues, and... (SET_BB_HEAD): New macro, for use as a lvalue. (BB_END, SET_BB_END): Likewise. (BB_HEADER, SET_BB_HEADER): Likewise. (BB_FOOTER, SET_BB_FOOTER): Likewise. * bb-reorder.c (add_labels_and_missing_jumps): Convert lvalue use of BB_* macros into SET_BB_* macros. (fix_crossing_unconditional_branches): Likewise. * caller-save.c (save_call_clobbered_regs): Likewise. (insert_one_insn): Likewise. * cfgbuild.c (find_bb_boundaries): Likewise. * cfgcleanup.c (merge_blocks_move_successor_nojumps): Likewise. (outgoing_edges_match): Likewise. (try_optimize_cfg): Likewise. * cfgexpand.c (expand_gimple_cond): Likewise. (expand_gimple_tailcall): Likewise. (expand_gimple_basic_block): Likewise. (construct_exit_block): Likewise. * cfgrtl.c (delete_insn): Likewise. (create_basic_block_structure): Likewise. (rtl_delete_block): Likewise. (rtl_split_block): Likewise. (emit_nop_for_unique_locus_between): Likewise. (rtl_merge_blocks): Likewise. (block_label): Likewise. (try_redirect_by_replacing_jump): Likewise. (emit_barrier_after_bb): Likewise. (fixup_abnormal_edges): Likewise. (record_effective_endpoints): Likewise. (relink_block_chain): Likewise. (fixup_reorder_chain): Likewise. (fixup_fallthru_exit_predecessor): Likewise. (cfg_layout_duplicate_bb): Likewise. (cfg_layout_split_block): Likewise. (cfg_layout_delete_block): Likewise. (cfg_layout_merge_blocks): Likewise. * combine.c (update_cfg_for_uncondjump): Likewise. * emit-rtl.c (add_insn_after): Likewise. (remove_insn): Likewise. (reorder_insns): Likewise. (emit_insn_after_1): Likewise. * haifa-sched.c (get_ebb_head_tail): Likewise. (restore_other_notes): Likewise. (move_insn): Likewise. (sched_extend_bb): Likewise. (fix_jump_move): Likewise. * ifcvt.c (noce_process_if_block): Likewise. (dead_or_predicable): Likewise. * ira.c (update_equiv_regs): Likewise. * reg-stack.c (change_stack): Likewise. * sel-sched-ir.c (sel_move_insn): Likewise. * sel-sched.c (move_nop_to_previous_block): Likewise. * config/c6x/c6x.c (hwloop_optimize): Likewise. * config/ia64/ia64.c (emit_predicate_relation_info): Likewise. / 2014-08-18 David Malcolm * rtx-classes-status.txt (TODO): Add SET_BB_HEAD, SET_BB_END, SET_BB_HEADER, SET_BB_FOOTER git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@214121 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/emit-rtl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gcc/emit-rtl.c') diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index 94f32753491..56aad90ab72 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -3997,7 +3997,7 @@ add_insn_after (rtx insn, rtx after, basic_block bb) /* Avoid clobbering of structure when creating new BB. */ && !BARRIER_P (insn) && !NOTE_INSN_BASIC_BLOCK_P (insn)) - BB_END (bb) = insn; + SET_BB_END (bb) = insn; } } @@ -4126,10 +4126,10 @@ remove_insn (rtx insn) /* Never ever delete the basic block note without deleting whole basic block. */ gcc_assert (!NOTE_P (insn)); - BB_HEAD (bb) = next; + SET_BB_HEAD (bb) = next; } if (BB_END (bb) == insn) - BB_END (bb) = prev; + SET_BB_END (bb) = prev; } } @@ -4229,12 +4229,12 @@ reorder_insns (rtx from, rtx to, rtx after) && (bb2 = BLOCK_FOR_INSN (from))) { if (BB_END (bb2) == to) - BB_END (bb2) = prev; + SET_BB_END (bb2) = prev; df_set_bb_dirty (bb2); } if (BB_END (bb) == after) - BB_END (bb) = to; + SET_BB_END (bb) = to; for (x = from; x != NEXT_INSN (to); x = NEXT_INSN (x)) if (!BARRIER_P (x)) @@ -4402,7 +4402,7 @@ emit_insn_after_1 (rtx first, rtx after, basic_block bb) df_insn_rescan (last); } if (BB_END (bb) == after) - BB_END (bb) = last; + SET_BB_END (bb) = last; } else for (last = first; NEXT_INSN (last); last = NEXT_INSN (last)) -- cgit v1.2.1