From: hp <hp@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 7 May 2004 03:20:24 +0000 (+0000)
Subject: 	PR optimization/15296
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=f17979aa28f0882c2083d518948e151dfdb2c81e

	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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81600 138bc75d-0d04-0410-961f-82ee72b054a4
---

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  <hp@axis.com>
+
+	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  <dave.anglin@nrc-cnrc.gc.ca>
 
 	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 ();