From 6634b72ee3e63c1fdd7a38b465783f7fd02cceaa Mon Sep 17 00:00:00 2001 From: dodji Date: Tue, 4 Aug 2009 12:26:01 +0000 Subject: [PATCH 1/1] 2009-08-04 Dodji Seketeli 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150452 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/error.c | 5 ++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/debug/dwarf2/pubnames-1.C | 13 +++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/debug/dwarf2/pubnames-1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 48561368800..506d83c7ffb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2009-08-04 Dodji Seketeli + + PR debug/39706 + * error.c (lang_decl_name): Print qualified names for decls + in namespace scope. + 2009-08-03 Jason Merrill Jakub Jelinek diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 25a05801622..239ff9ac07c 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -2331,7 +2331,10 @@ lang_decl_name (tree decl, int v, bool translate) reinit_cxx_pp (); pp_translate_identifiers (cxx_pp) = translate; - 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 26a37b1ad52..bd4ede19919 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-08-04 Dodji Seketeli + + PR debug/39706 + * g++.dg/debug/dwarf2/pubnames-1.C: New test. + 2009-08-03 Jason Merrill Jakub Jelinek 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 00000000000..b2f67036e24 --- /dev/null +++ b/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-1.C @@ -0,0 +1,13 @@ +// Contributed by Dodji Seketeli +// 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; } -- 2.11.0