diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 04a97a3a564..33f2df97aa0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep  9 20:15:46 1999  Richard Henderson  <rth@cygnus.com>
+
+	* c-decl.c (finish_function): When processing a nested function,
+	push and pop GC context around rest_of_compilation.
+
 Thu Sep  9 16:42:06 1999  Richard Henderson  <rth@cygnus.com>
 
 	* i386.c (override_options): Remove ppro, pentium2, and p2 as aliases.
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 1acb1601264..33c004252ff 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -6928,9 +6928,18 @@ finish_function (nested)
   /* So we can tell if jump_optimize sets it to 1.  */
   can_reach_end = 0;
 
+  /* If this is a nested function, protect the local variables in the stack
+     above us from being collected while we're compiling this function.  */
+  if (ggc_p && nested)
+    ggc_push_context ();
+
   /* Run the optimizers and output the assembler code for this function.  */
   rest_of_compilation (fndecl);
 
+  /* Undo the GC context switch.  */
+  if (ggc_p && nested)
+    ggc_pop_context ();
+
   current_function_returns_null |= can_reach_end;
 
   if (warn_missing_noreturn