PR 12161

	* decl2.c (mark_used): Use ggc_push_context/ggc_pop_context.
	* tree.c (cp_cannot_inline_tree_fn): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71084 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/cp/ChangeLog

+2003-09-02  Geoffrey Keating  <geoffk@apple.com>
+
+	PR 12161
+	* decl2.c (mark_used): Use ggc_push_context/ggc_pop_context.
+	* tree.c (cp_cannot_inline_tree_fn): Likewise.
+
 2003-09-04  Nathan Sidwell  <nathan@codesourcery.com>
 	* cp-tree.h (finish_sizeof, finish_alignof): Remove.

gcc/cp/decl2.c

@@ -4226,7 +4226,10 @@ mark_used (tree decl)
 		  information.  */
 	       || cp_function_chain->can_throw);
 
+      /* Our caller is likely to have lots of data on the stack.  */
+      ggc_push_context ();
       instantiate_decl (decl, defer);
+      ggc_pop_context ();
     }
 }
 

gcc/cp/tree.c

@@ -1992,7 +1992,16 @@ cp_cannot_inline_tree_fn (tree* fnp)
       if (!DECL_INLINE (DECL_TEMPLATE_RESULT 
 			(template_for_substitution (fn))))
 	return 1;
+
+      /* Our caller does not expect us to call ggc_collect, but
+	 instantiate_decl can call rest_of_compilation so we must
+	 protect our caller.  */
+      ggc_push_context();
+      
       fn = *fnp = instantiate_decl (fn, /*defer_ok=*/0);
+
+      ggc_pop_context();
+
       if (TI_PENDING_TEMPLATE_FLAG (DECL_TEMPLATE_INFO (fn)))
 	return 1;
     }