From 339ba33b4f6f90b30f41705cfc71e1ec2b81ac27 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Mon, 19 May 2014 06:49:58 +0000 Subject: reg-notes.def (CROSSING_JUMP): Likewise. gcc/ * reg-notes.def (CROSSING_JUMP): Likewise. * rtl.h (rtx_def): Update comment for jump flag. (CROSSING_JUMP_P): Define. * cfgcleanup.c (try_forward_edges, try_optimize_cfg): Use it instead of a REG_CROSSING_JUMP note. * cfghooks.c (tidy_fallthru_edges): Likewise. * cfgrtl.c (fixup_partition_crossing, rtl_verify_edges): Likewise. * emit-rtl.c (try_split): Likewise. * haifa-sched.c (sched_create_recovery_edges): Likewise. * ifcvt.c (find_if_case_1, find_if_case_2): Likewise. * jump.c (redirect_jump_2): Likewise. * reorg.c (follow_jumps, fill_slots_from_thread): Likewise. (relax_delay_slots): Likewise. * config/arc/arc.md (jump_i, cbranchsi4_scratch, *bbit): Likewise. (bbit_di): Likewise. * config/arc/arc.c (arc_reorg, arc_can_follow_jump): Likewise. * config/sh/sh.md (jump_compact): Likewise. * bb-reorder.c (rotate_loop): Likewise. (pass_duplicate_computed_gotos::execute): Likewise. (add_reg_crossing_jump_notes): Rename to... (update_crossing_jump_flags): ...this. (pass_partition_blocks::execute): Update accordingly. From-SVN: r210603 --- gcc/jump.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gcc/jump.c') diff --git a/gcc/jump.c b/gcc/jump.c index cdea8d5..9418f65 100644 --- a/gcc/jump.c +++ b/gcc/jump.c @@ -1590,11 +1590,7 @@ redirect_jump_2 (rtx jump, rtx olabel, rtx nlabel, int delete_unused, label and are now changing it into a direct conditional return. The jump is no longer crossing in that case. */ if (ANY_RETURN_P (nlabel)) - { - note = find_reg_note (jump, REG_CROSSING_JUMP, NULL_RTX); - if (note) - remove_note (jump, note); - } + CROSSING_JUMP_P (jump) = 0; if (!ANY_RETURN_P (olabel) && --LABEL_NUSES (olabel) == 0 && delete_unused > 0 -- cgit v1.1