From 2c4b5a9949b0bcfff38f3f0863bccfb4d5ff6a38 Mon Sep 17 00:00:00 2001 From: carlton Date: Tue, 16 Mar 2004 22:43:14 +0000 Subject: [PATCH] 2004-03-16 David Carlton * dwarf2read.c (process_structure_scope): Process children even when we're a declaration. --- gdb/ChangeLog | 5 +++++ gdb/dwarf2read.c | 36 +++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7a0008e95b..0fbac0566a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2004-03-16 David Carlton + + * dwarf2read.c (process_structure_scope): Process children even + when we're a declaration. + 2004-03-16 Andrew Cagney * symtab.h (find_pc_sect_partial_function): Delete declaration. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index c3453ae081..285eb6bd7a 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -3331,33 +3331,35 @@ process_structure_scope (struct die_info *die, struct dwarf2_cu *cu) { struct objfile *objfile = cu->objfile; const char *previous_prefix = processing_current_prefix; + struct die_info *child_die = die->child; if (TYPE_TAG_NAME (die->type) != NULL) processing_current_prefix = TYPE_TAG_NAME (die->type); - if (die->child != NULL && ! die_is_declaration (die, cu)) - { - struct die_info *child_die; - - child_die = die->child; + /* NOTE: carlton/2004-03-16: GCC 3.4 (or at least one of its + snapshots) has been known to create a die giving a declaration + for a class that has, as a child, a die giving a definition for a + nested class. So we have to process our children even if the + current die is a declaration. Normally, of course, a declaration + won't have any children at all. */ - while (child_die && child_die->tag) + while (child_die != NULL && child_die->tag) + { + if (child_die->tag == DW_TAG_member + || child_die->tag == DW_TAG_variable + || child_die->tag == DW_TAG_inheritance) { - if (child_die->tag == DW_TAG_member - || child_die->tag == DW_TAG_variable - || child_die->tag == DW_TAG_inheritance) - { - /* Do nothing. */ - } - else - process_die (child_die, cu); - - child_die = sibling_die (child_die); + /* Do nothing. */ } + else + process_die (child_die, cu); - new_symbol (die, die->type, cu); + child_die = sibling_die (child_die); } + if (die->child != NULL && ! die_is_declaration (die, cu)) + new_symbol (die, die->type, cu); + processing_current_prefix = previous_prefix; } -- 2.11.0