From faeb0946876005bec9b168c28582f0109e73f272 Mon Sep 17 00:00:00 2001 From: ccoutant Date: Thu, 18 Apr 2013 18:55:18 +0000 Subject: [PATCH] gcc/ * dwarf2out.c (output_pubnames): Check die_perennial_p of parent instead of die_mark. gcc/testsuite/ * g++.dg/debug/dwarf2/pubnames-2.C: Add -fno-debug-types-section. * g++.dg/debug/dwarf2/pubnames-3.C: New test case. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@198067 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 + gcc/dwarf2out.c | 6 +- gcc/testsuite/ChangeLog | 5 + gcc/testsuite/g++.dg/debug/dwarf2/pubnames-2.C | 2 +- gcc/testsuite/g++.dg/debug/dwarf2/pubnames-3.C | 193 +++++++++++++++++++++++++ 5 files changed, 208 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/debug/dwarf2/pubnames-3.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9ddfe02..40fb0c5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2013-04-18 Cary Coutant + + * dwarf2out.c (output_pubnames): Check die_perennial_p of + parent instead of die_mark. + 2013-04-18 Diego Novillo * gimple.c (create_gimple_tmp): New. diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 2475ade..b067b86 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -9018,11 +9018,13 @@ output_pubnames (vec *names) /* Enumerator names are part of the pubname table, but the parent DW_TAG_enumeration_type die may have been pruned. Don't output them if that is the case. */ - if (pub->die->die_tag == DW_TAG_enumerator && !pub->die->die_mark) + if (pub->die->die_tag == DW_TAG_enumerator && + (pub->die->die_parent == NULL + || !pub->die->die_parent->die_perennial_p)) continue; /* We shouldn't see pubnames for DIEs outside of the main CU. */ - if (names == pubname_table) + if (names == pubname_table && pub->die->die_tag != DW_TAG_enumerator) gcc_assert (pub->die->die_mark); if (names != pubtype_table diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8bced73..4c80729 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2013-04-18 Cary Coutant + * g++.dg/debug/dwarf2/pubnames-2.C: Add -fno-debug-types-section. + * g++.dg/debug/dwarf2/pubnames-3.C: New test case. + +2013-04-18 Cary Coutant + * g++.dg/debug/dwarf2/typedef2.C: Add -fno-debug-types-section flag. * g++.dg/debug/dwarf2/typedef4.C: Likewise. * g++.dg/debug/dwarf2/static-data-member1.C: Likewise. diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-2.C b/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-2.C index 64b121b..52ae5c4 100644 --- a/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-2.C +++ b/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-2.C @@ -1,5 +1,5 @@ // { dg-do compile } -// { dg-options "-gpubnames -gdwarf-4 -std=c++0x -dA" } +// { dg-options "-gpubnames -gdwarf-4 -fno-debug-types-section -std=c++0x -dA" } // { dg-final { scan-assembler-times "\.section\[\t \]\[^\n\]*debug_pubnames" 1 } } // { dg-final { scan-assembler "\"\\(anonymous namespace\\)\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } // { dg-final { scan-assembler "\"one\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-3.C b/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-3.C new file mode 100644 index 0000000..6c1e265 --- /dev/null +++ b/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-3.C @@ -0,0 +1,193 @@ +// { dg-do compile } +// { dg-options "-gpubnames -gdwarf-4 -fdebug-types-section -std=c++0x -dA" } +// { dg-final { scan-assembler-times "\.section\[\t \]\[^\n\]*debug_pubnames" 1 } } +// { dg-final { scan-assembler "\"\\(anonymous namespace\\)\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"one\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"one::G_A\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"one::G_B\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"one::G_C\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"one::\\(anonymous namespace\\)\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"F_A\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"F_B\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"F_C\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"inline_func_1\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"one::c1::c1\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"one::c1::~c1\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"one::c1::val\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"check_enum\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"main\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2::c2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2::c2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2::c2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"check\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"check \\>\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"check \\>\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"check \\>\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2::val\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2::val\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2::val\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"__static_initialization_and_destruction_0\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2::~c2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2::~c2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2::~c2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"anonymous_union_var\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::ci\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2v1\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2v2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2v3\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"one::c1v\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"one::\\(anonymous namespace\\)::one_anonymous_var\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"\\(anonymous namespace\\)::c1_count\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"\\(anonymous namespace\\)::c2_count\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"\\(anonymous namespace\\)::three\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"\\(anonymous namespace\\)::three::anonymous_three_var\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler-times "\.section\[\t \]\[^\n\]*debug_pubtypes" 1 } } +// { dg-final { scan-assembler "\"one::G\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"one::c1\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"int\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"one::c1\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"double\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"two::c2\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"F\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"anonymous_union_container\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } +// { dg-final { scan-assembler "\"bool\\\\0\"+\[ \t\]+\[#;/|@!]+\[ \t\]+external name" } } + +namespace +{ +int c1_count; +int c2_count; + +namespace three +{ +int anonymous_three_var; +} +}; + +namespace one +{ + +enum G +{ + G_A, + G_B, + G_C +}; + +namespace { +int one_anonymous_var; +} + +class c1 +{ + public: + static int count; + + c1() + { ++c1_count; } + + ~c1() + { + --c1_count; + } + + enum E + { + E_A, + E_B, + E_C, + }; + + int + val() + { return E_A; } +}; + +c1 c1v; +}; + +namespace two +{ +const int ci = 3; + +template +class c2 +{ + public: + c2(T t) + : t_(t) + { + ++c2_count; + } + + ~c2() + { --c2_count; } + + T + val() + { return this->t_; } + + T t_; +}; + +c2 c2v1(1); +c2 c2v2(2.0); +c2 c2v3(&ci); +}; + +enum F +{ + F_A, + F_B, + F_C +}; + +template +bool +check(C* c) +{ return c->val() == 0; } + +bool +check_enum(int i) +{ return i > 0; } + +struct anonymous_union_container { + union { + struct astruct { + int a; + }; + int b; + } u; +}; + +anonymous_union_container anonymous_union_var; + +#ifdef __GNUC__ +#define ALWAYS_INLINE __attribute__((always_inline)) +#else +#define ALWAYS_INLINE +#endif + +static inline ALWAYS_INLINE int +inline_func_1(int i) +{ return i * 17; } + +int +main() +{ + F f = F_A; + one::G g = one::G_A; + check_enum(f); + check_enum(g); + check(&one::c1v); + check(&two::c2v1); + check(&two::c2v2); + check(&two::c2v3); + anonymous_union_var.u.b = inline_func_1(3) - 51; + return anonymous_union_var.u.b; +} -- 2.7.4