diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e6ec38f9024..dbf80de2340 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 24 19:33:24 1999  Mark P. Mitchell  <mark@codesourcery.com>
+
+	* haifa-sched.c (schedule_insns): Don't assign LUIDs differently
+ 	depending on whether or not line-number notes are present.
+
 Sun Oct 24 20:29:59 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* cccp.c (progname, file_buf, default_include, include_file,
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 6fc172222a2..a92b73df476 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -6858,7 +6858,16 @@ schedule_insns (dump_file)
   for (b = 0; b < n_basic_blocks; b++)
     for (insn = BLOCK_HEAD (b);; insn = NEXT_INSN (insn))
       {
-	INSN_LUID (insn) = luid++;
+	INSN_LUID (insn) = luid;
+
+	/* Increment the next luid, unless this is a note.  We don't
+	   really need separate IDs for notes and we don't want to
+	   schedule differently depending on whether or not there are
+	   line-number notes, i.e., depending on whether or not we're
+	   generating debugging information.  */
+	if (GET_CODE (insn) != NOTE)
+	  ++luid;
+
 	if (insn == BLOCK_END (b))
 	  break;
       }