From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 17 Mar 2009 17:52:08 +0000 (+0100)
Subject: re PR debug/37890 (Incorrect nesting for DW_TAG_imported_declaration)
X-Git-Tag: releases/gcc-4.4.0~248
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47512a6e9deb02e7f81311de32fa3a9a06b94bae;p=thirdparty%2Fgcc.git

re PR debug/37890 (Incorrect nesting for DW_TAG_imported_declaration)

	PR debug/37890
	* name-lookup.c (do_namespace_alias): Don't call global_decl debug
	hook at function scope.

From-SVN: r144913
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b25d19be7cbe..f948a6e32f60 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -6,6 +6,10 @@
 	* cp-gimplify.c (cp_gimplify_expr): Don't assert the first operand
 	is a NAMESPACE_DECL.
 
+	PR debug/37890
+	* name-lookup.c (do_namespace_alias): Don't call global_decl debug
+	hook at function scope.
+
 	PR debug/39471
 	* cp-gimplify.c (cp_gimplify_expr): Don't set DECL_NAME
 	on IMPORTED_DECL.
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index eec7c44cbd9e..308df8c9c171 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -3337,7 +3337,8 @@ do_namespace_alias (tree alias, tree name_space)
   pushdecl (alias);
 
   /* Emit debug info for namespace alias.  */
-  (*debug_hooks->global_decl) (alias);
+  if (!building_stmt_tree ())
+    (*debug_hooks->global_decl) (alias);
 }
 
 /* Like pushdecl, only it places X in the current namespace,