PR rtl-optimization/14838

	* emit-rtl.c (get_first_nonnote_insn): Don't assume first insn is a
	note.
	(get_last_nonnote_insn): Don't assume last insn is a note.


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

2 files changed, 11 insertions, 16 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4604a925b69..b4126fde6a5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-22  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR rtl-optimization/14838
+	* emit-rtl.c (get_first_nonnote_insn): Don't assume first insn is a
+	note.
+	(get_last_nonnote_insn): Don't assume last insn is a note.
+
 2004-11-22  Roger Sayle  <roger@eyesopen.com>
 
 	* fold-const.c (nondestructive_fold_binary_to_constant): Rename
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index 051dd152d15..5f2d8b262a3 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -2738,15 +2738,9 @@ get_last_insn_anywhere (void)
 rtx
 get_first_nonnote_insn (void)
 {
-  rtx insn = first_insn;
-
-  while (insn)
-    {
-      insn = next_insn (insn);
-      if (insn == 0 || !NOTE_P (insn))
-	break;
-    }
+  rtx insn;
 
+  for (insn = first_insn; insn && NOTE_P (insn); insn = next_insn (insn));
   return insn;
 }
 
@@ -2756,15 +2750,9 @@ get_first_nonnote_insn (void)
 rtx
 get_last_nonnote_insn (void)
 {
-  rtx insn = last_insn;
-
-  while (insn)
-    {
-      insn = previous_insn (insn);
-      if (insn == 0 || !NOTE_P (insn))
-	break;
-    }
+  rtx insn;
 
+  for (insn = last_insn; insn && NOTE_P (insn); insn = previous_insn (insn));
   return insn;
 }