commit 53c671d19db2b1e61843fd87d9859a213a3f1353
Author: Jason Merrill <jason@redhat.com>
Date: Sat Oct 23 10:32:30 2010 -0400
* decl.c (finish_function): Don't look at function_depth.
@@ -12660,7 +12660,6 @@ finish_function (int flags)
tree fndecl = current_function_decl;
tree fntype, ctype = NULL_TREE;
int inclass_inline = (flags & 2) != 0;
- int nested;
/* When we get some parse errors, we can end up without a
current_function_decl, so cope. */
@@ -12672,7 +12671,6 @@ finish_function (int flags)
record_key_method_defined (fndecl);
- nested = function_depth > 1;
fntype = TREE_TYPE (fndecl);
/* TREE_READONLY (fndecl) = 1;
@@ -12883,11 +12881,7 @@ finish_function (int flags)
--function_depth;
/* Clean up. */
- if (! nested)
- /* Let the error reporting routines know that we're outside a
- function. For a nested function, this value is used in
- cxx_pop_function_context and then reset via pop_function_context. */
- current_function_decl = NULL_TREE;
+ current_function_decl = NULL_TREE;
defer_mark_used_calls = false;
if (deferred_mark_used_calls)