diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cca7d64c985..1c53bd77159 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-06  Richard Henderson  <rth@cygnus.com>
+
+	* flow.c (mark_set_1): Don't update conditional life info
+	if the register is not_dead.
+
 2000-05-06  Zack Weinberg  <zack@wolery.cumb.org>
 
 	* Makefile.in (STAGESTUFF): Add genrtl.c and genrtl.h.
diff --git a/gcc/flow.c b/gcc/flow.c
index 3b6635bec60..5e05b02987e 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -4252,7 +4252,7 @@ mark_set_1 (pbi, code, reg, cond, insn, flags)
 #ifdef HAVE_conditional_execution
       /* Consider conditional death in deciding that the register needs
 	 a death note.  */
-      if (some_was_live
+      if (some_was_live && ! not_dead
 	  /* The stack pointer is never dead.  Well, not strictly true,
 	     but it's very difficult to tell from here.  Hopefully
 	     combine_stack_adjustments will fix up the most egregious