re PR objc++/49221 (Several ICEs in the obj-c++ test suite after revision 174307)

PR objc++/49221
	* decl.c (cp_finish_decl): Check DECL_FUNCTION_SCOPE_P rather than
	at_function_scope_p.

From-SVN: r174683
This commit is contained in:
Jason Merrill 2011-06-06 00:18:03 -04:00 committed by Jason Merrill
parent 22d60ad267
commit efcbfc1c35
2 changed files with 5 additions and 1 deletions

View File

@ -1,5 +1,9 @@
2011-06-06 Jason Merrill <jason@redhat.com>
PR objc++/49221
* decl.c (cp_finish_decl): Check DECL_FUNCTION_SCOPE_P rather than
at_function_scope_p.
PR c++/49134
* tree.c (build_target_expr): Deal with ARM ABI tweaks.

View File

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