diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f59452de5300..fcc7fba70116 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-18  Jan Hubicka  <jh@suse.cz>
+
+	PR c++/22034
+	* cgraphunit.c (cgraph_varpool_assemble_pending_decls): Emit debug
+	info only for local statics, not for member variables.
+
 2005-08-18  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
 	* tree-data-ref.c (analyze_siv_subscript_cst_affine): Fix comment typo.
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index a10859dd0bc3..012cb7c23089 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -814,7 +814,10 @@ cgraph_varpool_assemble_pending_decls (void)
 	  assemble_variable (decl, 0, 1, 0);
 	  /* Local static variables are never seen by check_global_declarations
 	     so we need to output debug info by hand.  */
-	  if (decl_function_context (decl) && errorcount == 0 && sorrycount == 0)
+	  if (DECL_CONTEXT (decl) 
+	      && (TREE_CODE (DECL_CONTEXT (decl)) == BLOCK
+	          || TREE_CODE (DECL_CONTEXT (decl)) == FUNCTION_DECL)
+	      && errorcount == 0 && sorrycount == 0)
 	    {
 	      timevar_push (TV_SYMOUT);
 	      (*debug_hooks->global_decl) (decl);