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 f3f3008f676be61e9b6e8cfcbf295d9381d80678..3e239beae31f39ba00cfa9f70bcfc296c729eb5b 100644 (file)
--- 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 87df8581ad84cdac6740cb99f2dfa0ffb83adaa1..aebbf9523a65d9b546e4b73e3d9b7e118db39581 100644 (file)
--- 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'))