diff options
| author | Dodji Seketeli <dodji@redhat.com> | 2009-08-04 12:26:01 +0000 |
|---|---|---|
| committer | Dodji Seketeli <dodji@gcc.gnu.org> | 2009-08-04 14:26:01 +0200 |
| commit | b96fe38e469c9622c96f2e62b1db2590a2248338 (patch) | |
| tree | 088aa82c28896fc79a7a0abaca366d5feae99f66 | |
| parent | 567ef7490fbb1b2004dc99327e6190877717b844 (diff) | |
| download | gcc-b96fe38e469c9622c96f2e62b1db2590a2248338.zip gcc-b96fe38e469c9622c96f2e62b1db2590a2248338.tar.gz gcc-b96fe38e469c9622c96f2e62b1db2590a2248338.tar.bz2 | |
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: r150452
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/error.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/debug/dwarf2/pubnames-1.C | 13 |
4 files changed, 28 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4856136..506d83c 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-03 Jason Merrill <jason@redhat.com> Jakub Jelinek <jakub@redhat.com> diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 25a0580..239ff9a 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 26a37b1..bd4ede1 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-03 Jason Merrill <jason@redhat.com> Jakub Jelinek <jakub@redhat.com> 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 0000000..b2f6703 --- /dev/null +++ b/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-1.C @@ -0,0 +1,13 @@ +// 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; } |