diff options
| author | Pedro Alves <palves@redhat.com> | 2010-08-25 18:20:07 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2010-08-25 18:20:07 +0000 |
| commit | cd02d79dc87e7c6eb5a2b8bde46e41370ec79a09 (patch) | |
| tree | 5eb454104cd90ab755f2fdd948fd7afa289ad79e | |
| parent | 8dd881b6e33b95dbebe06d6929d7e7d30a151bd6 (diff) | |
| download | gdb-cd02d79dc87e7c6eb5a2b8bde46e41370ec79a09.zip gdb-cd02d79dc87e7c6eb5a2b8bde46e41370ec79a09.tar.gz gdb-cd02d79dc87e7c6eb5a2b8bde46e41370ec79a09.tar.bz2 | |
* dwarf2read.c (inherit_abstract_dies): Handle origin die's
compilation unit being different from target die's.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/dwarf2read.c | 27 |
2 files changed, 25 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 112fe1d..14bda9e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2010-08-25 Pedro Alves <pedro@codesourcery.com> + + * dwarf2read.c (inherit_abstract_dies): Handle origin die's + compilation unit being different from target die's. + 2010-08-24 Doug Evans <dje@google.com> PR symtab/11942 diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 5131e44..a807b95 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -5266,12 +5266,24 @@ inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu) struct die_info *origin_child_die; struct cleanup *cleanups; struct attribute *attr; + struct dwarf2_cu *origin_cu; + struct pending **origin_previous_list_in_scope; attr = dwarf2_attr (die, DW_AT_abstract_origin, cu); if (!attr) return; - origin_die = follow_die_ref (die, attr, &cu); + /* Note that following die references may follow to a die in a + different cu. */ + + origin_cu = cu; + origin_die = follow_die_ref (die, attr, &origin_cu); + + /* We're inheriting ORIGIN's children into the scope we'd put DIE's + symbols in. */ + origin_previous_list_in_scope = origin_cu->list_in_scope; + origin_cu->list_in_scope = cu->list_in_scope; + if (die->tag != origin_die->tag && !(die->tag == DW_TAG_inlined_subroutine && origin_die->tag == DW_TAG_subprogram)) @@ -5299,16 +5311,16 @@ inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu) but GCC versions at least through 4.4 generate this (GCC PR 40573). */ struct die_info *child_origin_die = child_die; + struct dwarf2_cu *child_origin_cu = cu; while (1) { - attr = dwarf2_attr (child_origin_die, DW_AT_abstract_origin, cu); + attr = dwarf2_attr (child_origin_die, DW_AT_abstract_origin, + child_origin_cu); if (attr == NULL) break; - /* FIXME: cu becomes CU of child_origin_die. - What about the next iteration of the outer loop? - cu might then be bogus (won't be CU for child_die). */ - child_origin_die = follow_die_ref (child_origin_die, attr, &cu); + child_origin_die = follow_die_ref (child_origin_die, attr, + &child_origin_cu); } /* According to DWARF3 3.3.8.2 #3 new entries without their abstract @@ -5350,10 +5362,11 @@ inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu) if (offsetp >= offsets_end || *offsetp > origin_child_die->offset) { /* Found that ORIGIN_CHILD_DIE is really not referenced. */ - process_die (origin_child_die, cu); + process_die (origin_child_die, origin_cu); } origin_child_die = sibling_die (origin_child_die); } + origin_cu->list_in_scope = origin_previous_list_in_scope; do_cleanups (cleanups); } |