From 3e755d23ce40ee33be8a731a27aad19a799935b7 Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Tue, 8 Mar 1994 12:49:11 -0800 Subject: [PATCH] (finish_decl): When saving/discarding initializers, don't check TREE_PERMANENT and TREE_STATIC. (finish_decl, finish_function): Pass new argument to permanent_allocation. From-SVN: r6722 --- gcc/c-decl.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 76d890b8e04..889a185209f 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -3558,8 +3558,11 @@ finish_decl (decl, init, asmspec_tree) } /* ??? After 2.3, test (init != 0) instead of TREE_CODE. */ + /* This test used to include TREE_PERMANENT, however, we have the same + problem with initializers at the function level. Such initializers get + saved until the end of the function on the momentary_obstack. */ if (!(TREE_CODE (decl) == FUNCTION_DECL && DECL_INLINE (decl)) - && temporary && TREE_PERMANENT (decl) + && temporary /* DECL_INITIAL is not defined in PARM_DECLs, since it shares space with DECL_ARG_TYPE. */ && TREE_CODE (decl) != PARM_DECL) @@ -3572,10 +3575,12 @@ finish_decl (decl, init, asmspec_tree) to have a copy of the top-level decl's DECL_INLINE. */ if (DECL_INITIAL (decl) != 0) { - /* If this is a static const variable, then preserve the + /* If this is a const variable, then preserve the initializer instead of discarding it so that we can optimize references to it. */ - if (TREE_STATIC (decl) && TREE_READONLY (decl)) + /* This test used to include TREE_STATIC, but this won't be set + for function level initializers. */ + if (TREE_READONLY (decl)) { preserve_initializer (); /* Hack? Set the permanent bit for something that is permanent, @@ -3616,7 +3621,7 @@ finish_decl (decl, init, asmspec_tree) /* If we have gone back from temporary to permanent allocation, actually free the temporary space that we no longer need. */ if (temporary && !allocation_temporary_p ()) - permanent_allocation (); + permanent_allocation (0); /* At the end of a declaration, throw away any variable type sizes of types defined inside that declaration. There is no use @@ -6545,7 +6550,7 @@ finish_function (nested) /* Switch back to allocating nodes permanently until we start another function. */ if (! nested) - permanent_allocation (); + permanent_allocation (1); if (DECL_SAVED_INSNS (fndecl) == 0 && ! nested) { -- 2.30.2