diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4fcef1c3284..828b9a30caa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 24 13:49:45 2000  Jeffrey A Law  (law@cygnus.com)
+
+	* integrate.c (save_for_inline_nocopy): Clear in_nonparm_insns here.
+	(save_parm_insns): Not here.
+
 2000-03-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* builtins.c (expand_builtin_bzero): New function.
diff --git a/gcc/integrate.c b/gcc/integrate.c
index e0374e1d9ff..2325fae9a01 100644
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -426,6 +426,7 @@ save_for_inline_nocopy (fndecl)
      perform constant folding when its incoming value is constant).
      Otherwise, we have to copy its value into a new register and track
      the new register's life.  */
+  in_nonparm_insns = 0;
   save_parm_insns (insn, first_nonparm_insn);
 
   /* We have now allocated all that needs to be allocated permanently
@@ -455,8 +456,6 @@ save_parm_insns (insn, first_nonparm_insn)
     rtx insn;
     rtx first_nonparm_insn;
 {
-  in_nonparm_insns = 0;
-
   if (insn == NULL_RTX)
     return;