From 1a9861e6292552cfef9fb0a9b59ce8ce9e596a15 Mon Sep 17 00:00:00 2001 From: Geoffrey Keating Date: Thu, 4 Sep 2003 19:48:22 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl2.c | 3 +++ gcc/cp/tree.c | 9 +++++++++ 3 files changed, 18 insertions(+) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3c3112dc525..ca8ea06d7fc 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2003-09-02 Geoffrey Keating + + 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 * cp-tree.h (finish_sizeof, finish_alignof): Remove. diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index d74f2907424..7ca20c8ef30 100644 --- a/gcc/cp/decl2.c +++ b/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 (); } } diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 71742a7bba7..1dddad4933d 100644 --- a/gcc/cp/tree.c +++ b/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; } -- 2.30.2