gdb/

	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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0a7dc619645511b00c6522852e8d4e623cfd687b..41546492be1dc786180d402439b6ba12caa0ee97 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index ba5680f91ce89ba2a68a6737703856a1d4f3d691..2a47c7d19b08fc62a9ee2a5253cf8e635fed001c 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -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);