diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 668dd5e19d4..9d0b8f0d9f8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -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.
 
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 232b5cf12f3..30f70d9e6ee 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