From: Hans-Peter Nilsson Date: Fri, 7 May 2004 03:20:24 +0000 (+0000) Subject: re PR rtl-optimization/15296 ([3.4 only] Delayed branch scheduling causing invalid... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=afce2847b300b1924a08f1fd76b048d94dc22305;p=gcc.git re PR rtl-optimization/15296 ([3.4 only] Delayed branch scheduling causing invalid code on cris-*) PR optimization/15296 * reorg.c (fill_simple_delay_slots): Use next_real_insn when getting last consecutive label at a branch. (relax_delay_slots): Similar, near top of loop. From-SVN: r81600 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c87394fb900..b0eee233a4a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2004-05-07 Hans-Peter Nilsson + + PR optimization/15296 + * reorg.c (fill_simple_delay_slots): Use next_real_insn when + getting last consecutive label at a branch. + (relax_delay_slots): Similar, near top of loop. + 2004-05-06 John David Anglin PR target/15202 diff --git a/gcc/reorg.c b/gcc/reorg.c index 9a58d34b29f..2ae0a8f2259 100644 --- a/gcc/reorg.c +++ b/gcc/reorg.c @@ -2349,7 +2349,9 @@ fill_simple_delay_slots (int non_jumps_p) && eligible_for_delay (insn, slots_filled, next_trial, flags) && ! can_throw_internal (trial)) { - rtx new_label = next_active_insn (next_trial); + /* See comment in relax_delay_slots about necessity of using + next_real_insn here. */ + rtx new_label = next_real_insn (next_trial); if (new_label != 0) new_label = get_label_before (new_label); @@ -3074,7 +3076,9 @@ relax_delay_slots (rtx first) && (target_label = JUMP_LABEL (insn)) != 0) { target_label = follow_jumps (target_label); - target_label = prev_label (next_active_insn (target_label)); + /* See comment further down why we must use next_real_insn here, + instead of next_active_insn. */ + target_label = prev_label (next_real_insn (target_label)); if (target_label == 0) target_label = find_end_label ();