diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 82eccb9e93a..c17374e726f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -5,6 +5,9 @@ Tue Aug 18 12:40:27 1998  Richard Henderson  <rth@cygnus.com>
 
 Tue Aug 18 10:33:30 1998  Jeffrey A Law  (law@cygnus.com)
 
+	* regmove.c (fixup_match_2): Do not call reg_overlap_mentioned_p
+	on notes.
+
 	* Makefile.in (cplus-dem.o): Provide explicit rules for building
 	cplus-dem.o
 
diff --git a/gcc/regmove.c b/gcc/regmove.c
index 87865532248..ba78411bea8 100644
--- a/gcc/regmove.c
+++ b/gcc/regmove.c
@@ -823,6 +823,8 @@ fixup_match_2 (insn, dst, src, offset, regmove_dump_file)
 			  && (NOTE_LINE_NUMBER (p) == NOTE_INSN_LOOP_BEG
 			      || NOTE_LINE_NUMBER (p) == NOTE_INSN_LOOP_END)))
 		    break;
+		  if (GET_RTX_CLASS (GET_CODE (p)) != 'i')
+		    continue;
 		  if (reg_overlap_mentioned_p (dst, PATTERN (p)))
 		    {
 		      if (try_auto_increment (p, insn, 0, dst, newconst, 0))