re PR c++/12161 (ICE during bootstrap, locale-inst.c, cp/call.c: 4571)

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

From-SVN: r71084
This commit is contained in:
Geoffrey Keating 2003-09-04 19:48:22 +00:00 committed by Geoffrey Keating
parent 33d05111e7
commit 1a9861e629
3 changed files with 18 additions and 0 deletions

View File

@ -1,3 +1,9 @@
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.

View File

@ -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 ();
}
}

View File

@ -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;
}