From: Richard Henderson <rth@cygnus.com>
Date: Sun, 5 Sep 1999 04:53:04 +0000 (-0700)
Subject: haifa-sched.c (schedule_block): Use next_nonnote_insn instead of NEXT_INSN when...
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0d8b2ca1e12586ade7f6b2f957c998f16505b4eb;p=gcc.git

haifa-sched.c (schedule_block): Use next_nonnote_insn instead of NEXT_INSN when...

        * haifa-sched.c (schedule_block): Use next_nonnote_insn instead
        of NEXT_INSN when examining speculative insns for SCHED_GROUP_P.

From-SVN: r29123
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f3f3008f676..3e239beae31 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep  4 21:52:32 1999  Richard Henderson  <rth@cygnus.com>
+
+	* haifa-sched.c (schedule_block): Use next_nonnote_insn instead
+	of NEXT_INSN when examining speculative insns for SCHED_GROUP_P.
+
 Sat Sep  4 20:40:19 1999  Richard Henderson  <rth@cygnus.com>
 	                  Bernd Schmidt <bernds@cygnus.co.uk>
 	                  Mark Mitchell  <mark@codesourcery.com>
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 87df8581ad8..aebbf9523a6 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -6767,7 +6767,10 @@ schedule_block (bb, rgn_n_insns)
 	      {
 		rtx next;
 
-		next = NEXT_INSN (insn);
+		/* Note that we havn't squirrled away the notes for 
+		   blocks other than the current.  So if this is a
+		   speculative insn, NEXT might otherwise be a note.  */
+		next = next_nonnote_insn (insn);
 		if (INSN_DEP_COUNT (insn) == 0
 		    && (SCHED_GROUP_P (next) == 0
 			|| GET_RTX_CLASS (GET_CODE (next)) != 'i'))