OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2002-12-05 David Carlton <carlton@math.stanford.edu> 

* dwarf2read.c (dwarf2_add_field): Treat a field that is a
	DW_TAG_member as well as a declaration as being a C++ static data
	member.
	(read_structure_scope): Combine tests for DW_TAG_member and
	DW_TAG_variable.
This commit is contained in:
David Carlton 2002-12-05 23:13:47 +00:00
parent b6be6416fd
commit a9a9bd0f66
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2002-12-05 David Carlton <carlton@math.stanford.edu>
* dwarf2read.c (dwarf2_add_field): Treat a field that is a
DW_TAG_member as well as a declaration as being a C++ static data
member.
(read_structure_scope): Combine tests for DW_TAG_member and
DW_TAG_variable.
2002-12-05 David Carlton <carlton@math.stanford.edu>
* linespec.c (decode_compound): New function.

30
gdb/dwarf2read.c
View File

@ -2146,8 +2146,11 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
new_field->virtuality = DW_UNSND (attr);
fp = &new_field->field;
if (die->tag == DW_TAG_member)
if (die->tag == DW_TAG_member && ! die_is_declaration (die))
{
/* Data member other than a C++ static data member. */
/* Get type of field. */
fp->type = die_type (die, objfile, cu_header);
@ -2232,12 +2235,18 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
fip->non_public_fields = 1;
}
}
else if (die->tag == DW_TAG_variable)
else if (die->tag == DW_TAG_member || die->tag == DW_TAG_variable)
{
/* C++ static member. */
/* NOTE: carlton/2002-11-05: It should be a DW_TAG_member that
is a declaration, but all versions of G++ as of this writing
(so through at least 3.2.1) incorrectly generate
DW_TAG_variable tags. */
char *physname;
/* C++ static member.
Get name of field. */
/* Get name of field. */
attr = dwarf_attr (die, DW_AT_name);
if (attr && DW_STRING (attr))
fieldname = DW_STRING (attr);
@ -2605,13 +2614,14 @@ read_structure_scope (struct die_info *die, struct objfile *objfile,
while (child_die && child_die->tag)
{
if (child_die->tag == DW_TAG_member)
if (child_die->tag == DW_TAG_member
|| child_die->tag == DW_TAG_variable)
{
dwarf2_add_field (&fi, child_die, objfile, cu_header);
}
else if (child_die->tag == DW_TAG_variable)
{
/* C++ static member. */
/* NOTE: carlton/2002-11-05: A C++ static data member
should be a DW_TAG_member that is a declaration, but
all versions of G++ as of this writing (so through at
least 3.2.1) incorrectly generate DW_TAG_variable
tags for them instead. */
dwarf2_add_field (&fi, child_die, objfile, cu_header);
}
else if (child_die->tag == DW_TAG_subprogram)