Revert:
	2011-03-08  Jan Kratochvil  <jan.kratochvil@redhat.com>
	Fix DWARF-3+ DW_AT_accessibility default assumption.
	* dwarf2read.c (dwarf2_add_field): Fix new_field->accessibility for
	cu->header.version >= 3.
This commit is contained in:
Jan Kratochvil 2011-03-09 07:07:55 +00:00
parent d9837b00fd
commit f8de3c55e9
2 changed files with 14 additions and 18 deletions

View File

@ -1,3 +1,11 @@
2011-03-09 Jan Kratochvil <jan.kratochvil@redhat.com>
Revert:
2011-03-08 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix DWARF-3+ DW_AT_accessibility default assumption.
* dwarf2read.c (dwarf2_add_field): Fix new_field->accessibility for
cu->header.version >= 3.
2011-03-09 Yao Qi <yao@codesourcery.com>
* common/Makefile.in: Remove.

View File

@ -6238,25 +6238,13 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
}
fip->nfields++;
if (cu->header.version < 3)
{
/* The default DWARF 2 accessibility for members is public, the default
accessibility for inheritance is private. */
if (die->tag != DW_TAG_inheritance)
new_field->accessibility = DW_ACCESS_public;
else
new_field->accessibility = DW_ACCESS_private;
}
/* Handle accessibility and virtuality of field.
The default accessibility for members is public, the default
accessibility for inheritance is private. */
if (die->tag != DW_TAG_inheritance)
new_field->accessibility = DW_ACCESS_public;
else
{
/* DWARF 3 specifies the default accessibility explicitly. */
if (die->parent->tag == DW_TAG_class_type)
new_field->accessibility = DW_ACCESS_private;
else
new_field->accessibility = DW_ACCESS_public;
}
new_field->accessibility = DW_ACCESS_private;
new_field->virtuality = DW_VIRTUALITY_none;
attr = dwarf2_attr (die, DW_AT_accessibility, cu);