diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-04-06 22:46:29 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-04-06 22:46:29 +0200 |
| commit | ed3cd38d63e8af971469f5eb551f8cfc08a83f09 (patch) | |
| tree | ad9d43a716508a1d3627dc4f83184c729135240b /gcc/dwarf2out.c | |
| parent | 926e747845a2cb5782942735d28abf479c2d825c (diff) | |
| download | gcc-ed3cd38d63e8af971469f5eb551f8cfc08a83f09.zip gcc-ed3cd38d63e8af971469f5eb551f8cfc08a83f09.tar.gz gcc-ed3cd38d63e8af971469f5eb551f8cfc08a83f09.tar.bz2 | |
re PR debug/80234 (ICE in splice_child_die at dwarfout.c:5265)
PR debug/80234
* dwarf2out.c (gen_member_die): Handle C++17 inline static data
members with redundant out-of-class redeclaration.
* g++.dg/debug/dwarf2/pr80234-1.C: New test.
* g++.dg/debug/dwarf2/pr80234-2.C: New test.
From-SVN: r246743
Diffstat (limited to 'gcc/dwarf2out.c')
| -rw-r--r-- | gcc/dwarf2out.c | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index a00febb..8c3b186 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -24085,6 +24085,10 @@ gen_member_die (tree type, dw_die_ref context_die) for (member = TYPE_FIELDS (type); member; member = DECL_CHAIN (member)) { struct vlr_context vlr_ctx = { type, NULL_TREE }; + bool static_inline_p + = (TREE_STATIC (member) + && (lang_hooks.decls.decl_dwarf_attribute (member, DW_AT_inline) + != -1)); /* If we thought we were generating minimal debug info for TYPE and then changed our minds, some of the member declarations @@ -24096,9 +24100,33 @@ gen_member_die (tree type, dw_die_ref context_die) { /* Handle inline static data members, which only have in-class declarations. */ + dw_die_ref ref = NULL; + if (child->die_tag == DW_TAG_variable + && child->die_parent == comp_unit_die ()) + { + ref = get_AT_ref (child, DW_AT_specification); + /* For C++17 inline static data members followed by redundant + out of class redeclaration, we might get here with + child being the DIE created for the out of class + redeclaration and with its DW_AT_specification being + the DIE created for in-class definition. We want to + reparent the latter, and don't want to create another + DIE with DW_AT_specification in that case, because + we already have one. */ + if (ref + && static_inline_p + && ref->die_tag == DW_TAG_variable + && ref->die_parent == comp_unit_die () + && get_AT (ref, DW_AT_specification) == NULL) + { + child = ref; + ref = NULL; + static_inline_p = false; + } + } if (child->die_tag == DW_TAG_variable && child->die_parent == comp_unit_die () - && get_AT (child, DW_AT_specification) == NULL) + && ref == NULL) { reparent_child (child, context_die); if (dwarf_version < 5) @@ -24126,9 +24154,7 @@ gen_member_die (tree type, dw_die_ref context_die) /* For C++ inline static data members emit immediately a DW_TAG_variable DIE that will refer to that DW_TAG_member/DW_TAG_variable through DW_AT_specification. */ - if (TREE_STATIC (member) - && (lang_hooks.decls.decl_dwarf_attribute (member, DW_AT_inline) - != -1)) + if (static_inline_p) { int old_extern = DECL_EXTERNAL (member); DECL_EXTERNAL (member) = 0; |