diff options
| author | Richard Henderson <rth@redhat.com> | 2003-09-08 08:56:27 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2003-09-08 08:56:27 -0700 |
| commit | c1f927e84ec73debafbc0114cc4d81abd1b27ae7 (patch) | |
| tree | ad932cb4dec8a82eb9fd686cb0a6c341596f0816 /gcc/c-decl.c | |
| parent | 7f14bbe68f1fac27349b5154730aeb2e23e97dfa (diff) | |
| download | gcc-c1f927e84ec73debafbc0114cc4d81abd1b27ae7.zip gcc-c1f927e84ec73debafbc0114cc4d81abd1b27ae7.tar.gz gcc-c1f927e84ec73debafbc0114cc4d81abd1b27ae7.tar.bz2 | |
c-decl.c (c_expand_body_1): Push and pop function context here.
gcc/
* c-decl.c (c_expand_body_1): Push and pop function context here.
* tree-optimize.c (tree_rest_of_compilation): ... not here. Take
nested argument instead of computing nesting ourselves.
gcc/cp/
* decl.c (finish_function): Clear current_function_decl.
* decl2.c (mark_used): Don't push/pop gc context.
* optimize.c (optimize_function): Likewise.
* tree.c (cp_cannot_inline_tree_fn): Likewise.
* pt.c (instantiate_decl): Inc/dec function_depth instead.
* semantics.c (expand_body): Update for tree_rest_of_compilation
nested argument.
From-SVN: r71208
Diffstat (limited to 'gcc/c-decl.c')
| -rw-r--r-- | gcc/c-decl.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gcc/c-decl.c b/gcc/c-decl.c index f4896f3..6afcd7a 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -6181,9 +6181,16 @@ c_expand_body_1 (tree fndecl, int nested_p) /* Make sure that we will evaluate variable-sized types involved in our function's type. */ expand_pending_sizes (DECL_LANG_SPECIFIC (fndecl)->pending_sizes); + + /* Squirrel away our current state. */ + push_function_context (); } - tree_rest_of_compilation (fndecl); + tree_rest_of_compilation (fndecl, nested_p); + + if (nested_p) + /* Return to the enclosing function. */ + pop_function_context (); if (DECL_STATIC_CONSTRUCTOR (fndecl)) { |