diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index abc949018cd..4354846d381 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-26  Richard Henderson  <rth@cygnus.com>
+
+	* flow.c (allocate_reg_life_data): Set max_regno here ...
+	(life_analysis): ... not here.
+
 2000-04-26  Richard Henderson  <rth@cygnus.com>
 
 	* jump.c (redirect_exp_1): Rework from old redirect_exp.  Never
diff --git a/gcc/flow.c b/gcc/flow.c
index 8ee75052a8a..5a729c77d7d 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -2512,8 +2512,6 @@ life_analysis (f, file, flags)
   if (flags & PROP_SCAN_DEAD_CODE)
     init_alias_analysis ();
 
-  max_regno = max_reg_num ();
-
   /* Always remove no-op moves.  Do this before other processing so
      that we don't have to keep re-scanning them.  */
   delete_noop_moves (f);
@@ -3206,6 +3204,8 @@ allocate_reg_life_data ()
 {
   int i;
 
+  max_regno = max_reg_num ();
+
   /* Recalculate the register space, in case it has grown.  Old style
      vector oriented regsets would set regset_{size,bytes} here also.  */
   allocate_reg_info (max_regno, FALSE, FALSE);