This was happening because objc_eh_runtime_type wanted to create global
decls while we were in the middle of processing a function, and
cp_finish_decl assumed that if we're in a function the decl must belong
to the function. We can avoid that assumption by checking the
DECL_CONTEXT rather than current scope.
Tested x86_64-pc-linux-gnu, applying to trunk.
commit ea2b4023d77cbb75ffdb0f71fec35d366b759a70
Author: Jason Merrill <ja...@redhat.com>
Date: Sun Jun 5 23:42:13 2011 -0400
PR objc++/49221
* decl.c (cp_finish_decl): Check DECL_FUNCTION_SCOPE_P rather than
at_function_scope_p.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 232b5cf..30f70d9 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6190,7 +6190,7 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p,
/* Add this declaration to the statement-tree. This needs to happen
after the call to check_initializer so that the DECL_EXPR for a
reference temp is added before the DECL_EXPR for the reference itself. */
- if (at_function_scope_p ())
+ if (DECL_FUNCTION_SCOPE_P (decl))
add_decl_expr (decl);
/* Let the middle end know about variables and functions -- but not
