OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* decl.c (finish_function): Don't look at function_depth. 

From-SVN: r165967
This commit is contained in:
Jason Merrill 2010-10-26 11:02:39 -04:00 committed by Jason Merrill
parent 6e2f8c15bc
commit d70a517942
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
2010-10-26 Jason Merrill <jason@redhat.com>
* decl.c (finish_function): Don't look at function_depth.
2010-10-25 Rodrigo Rivas Costa <rodrigorivascosta@gmail.com>
Implement opaque-enum-specifiers for C++0x.

8
gcc/cp/decl.c
View File

@ -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)