diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6534ad18c18..7d92a5ca03d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-29  Richard Henderson  <rth@cygnus.com>
+
+	* jump.c (redirect_jump): Don't emit NOTE_INSN_FUNCTION_END
+	if nlabel is null.
+
 2000-05-29  Zack Weinberg  <zack@wolery.cumb.org>
 
 	* cpplib.h (cpp_reader): Remove if_stack.  Change
diff --git a/gcc/jump.c b/gcc/jump.c
index a5e878721ec..d8c34832dfc 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -3246,7 +3246,8 @@ redirect_jump (jump, nlabel, delete_unused)
 
   /* If we're eliding the jump over exception cleanups at the end of a
      function, move the function end note so that -Wreturn-type works.  */
-  if (olabel && NEXT_INSN (olabel)
+  if (olabel && nlabel
+      && NEXT_INSN (olabel)
       && GET_CODE (NEXT_INSN (olabel)) == NOTE
       && NOTE_LINE_NUMBER (NEXT_INSN (olabel)) == NOTE_INSN_FUNCTION_END)
     emit_note_after (NOTE_INSN_FUNCTION_END, nlabel);