From: Dodji Seketeli <dodji@redhat.com>
Date: Tue, 4 Aug 2009 16:59:11 +0000 (+0000)
Subject: re PR debug/39706 (namespaces represented incorrectly in debug_pubnames)
X-Git-Tag: releases/gcc-4.3.5~450
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a467cd23b53d2de6461d7c37640fd2de62411e8;p=thirdparty%2Fgcc.git

re PR debug/39706 (namespaces represented incorrectly in debug_pubnames)

2009-08-04  Dodji Seketeli  <dodji@redhat.com>

gcc/cp/ChangeLog:
	PR debug/39706
	* error.c (lang_decl_name): Print qualified names for decls
	in  namespace scope.

gcc/testsuite/ChangeLog:
	PR debug/39706
	* g++.dg/debug/dwarf2/pubnames-1.C: New test.

From-SVN: r150462
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 688f6b8b7f05..bdb69b238ba8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-04  Dodji Seketeli  <dodji@redhat.com>
+
+	PR debug/39706
+	* error.c (lang_decl_name): Print qualified names for decls
+	in  namespace scope.
+
 2009-08-04  Release Manager
 
 	* GCC 4.3.4 released.
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 700a1127426d..8b53257425f4 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -2195,7 +2195,10 @@ lang_decl_name (tree decl, int v)
     return decl_as_string (decl, TFF_DECL_SPECIFIERS);
 
   reinit_cxx_pp ();
-  if (v == 1 && DECL_CLASS_SCOPE_P (decl))
+  if (v == 1
+      && (DECL_CLASS_SCOPE_P (decl)
+	  || (DECL_NAMESPACE_SCOPE_P (decl)
+	      && CP_DECL_CONTEXT (decl) != global_namespace)))
     {
       dump_type (CP_DECL_CONTEXT (decl), TFF_PLAIN_IDENTIFIER);
       pp_cxx_colon_colon (cxx_pp);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ccc8a38b5191..a8543d14776f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-04  Dodji Seketeli  <dodji@redhat.com>
+
+	PR debug/39706
+	* g++.dg/debug/dwarf2/pubnames-1.C: New test.
+
 2009-08-04  Release Manager
 
 	* GCC 4.3.4 released.
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-1.C b/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-1.C
new file mode 100644
index 000000000000..f5089ca2da81
--- /dev/null
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-1.C
@@ -0,0 +1,14 @@
+// Contributed by Dodji Seketeli <dodji@redhat.com>
+// Origin PR debug/39706
+// { dg-options "-g -dA" }
+// { dg-do compile }
+// { dg-final { scan-assembler-times ".debug_pubnames" 1 } }
+// { dg-final { scan-assembler-times "\"main\".*external name" 1 } }
+// { dg-final { scan-assembler-times "\"ns::ns_x.*external name" 1 } }
+// { dg-final { scan-assembler-times "\"y::y_x.*external name" 1 } }
+
+namespace ns { int ns_x; }
+class y { public: static int y_x; };
+int y::y_x;
+int main() { return ns::ns_x; }
+