Patchwork Fix up DW_AT_accessibility (PR debug/45124)

login
register
mail settings
Submitter Jakub Jelinek
Date Sept. 20, 2010, 10:24 a.m.
Message ID <20100920102419.GI1269@tyan-ft48-01.lab.bos.redhat.com>
Download mbox | patch
Permalink /patch/65195/
State New
Headers show

Comments

Jakub Jelinek - Sept. 20, 2010, 10:24 a.m.
On Fri, Sep 17, 2010 at 02:17:32PM -0400, Jason Merrill wrote:
> On 09/17/2010 01:44 PM, Jakub Jelinek wrote:
> >So, should GCC assume for DWARF3+ that the default is always what the
> >language (C++ in this case) says is the default (and adjust the standard)?
> 
> Yes.

Ok, so this patch implements that.  Bootstrapped/regtested on x86_64-linux
and i686-linux, ok for trunk?

2010-09-20  Jakub Jelinek  <jakub@redhat.com>

	PR debug/45124
	* dwarf2out.c (add_accessibility_attribute): Assume
	DW_ACCESS_private as the default for dwarf_version > 2
	and DW_TAG_class_type parent.
	(gen_inheritance_die): Assume DW_ACCESS_public as the default
	for dwarf_version > 2 and parent other than DW_TAG_class_type.



	Jakub
Jason Merrill - Sept. 20, 2010, 3:01 p.m.
OK.

Jason

Patch

--- gcc/dwarf2out.c.jj	2010-09-19 18:55:48.663604621 +0200
+++ gcc/dwarf2out.c	2010-09-19 19:05:20.946228742 +0200
@@ -15832,10 +15832,22 @@  add_AT_location_description (dw_die_ref 
 static void
 add_accessibility_attribute (dw_die_ref die, tree decl)
 {
+  /* In DWARF3+ the default is DW_ACCESS_private only in DW_TAG_class_type
+     children, otherwise the default is DW_ACCESS_public.  In DWARF2
+     the default has always been DW_ACCESS_public.  */
   if (TREE_PROTECTED (decl))
     add_AT_unsigned (die, DW_AT_accessibility, DW_ACCESS_protected);
   else if (TREE_PRIVATE (decl))
-    add_AT_unsigned (die, DW_AT_accessibility, DW_ACCESS_private);
+    {
+      if (dwarf_version == 2
+	  || die->die_parent == NULL
+	  || die->die_parent->die_tag != DW_TAG_class_type)
+	add_AT_unsigned (die, DW_AT_accessibility, DW_ACCESS_private);
+    }
+  else if (dwarf_version > 2
+	   && die->die_parent
+	   && die->die_parent->die_tag == DW_TAG_class_type)
+    add_AT_unsigned (die, DW_AT_accessibility, DW_ACCESS_public);
 }
 
 /* Attach the specialized form of location attribute used for data members of
@@ -19552,10 +19564,20 @@  gen_inheritance_die (tree binfo, tree ac
   if (BINFO_VIRTUAL_P (binfo))
     add_AT_unsigned (die, DW_AT_virtuality, DW_VIRTUALITY_virtual);
 
+  /* In DWARF3+ the default is DW_ACCESS_private only in DW_TAG_class_type
+     children, otherwise the default is DW_ACCESS_public.  In DWARF2
+     the default has always been DW_ACCESS_private.  */
   if (access == access_public_node)
-    add_AT_unsigned (die, DW_AT_accessibility, DW_ACCESS_public);
+    {
+      if (dwarf_version == 2
+	  || context_die->die_tag == DW_TAG_class_type)
+      add_AT_unsigned (die, DW_AT_accessibility, DW_ACCESS_public);
+    }
   else if (access == access_protected_node)
     add_AT_unsigned (die, DW_AT_accessibility, DW_ACCESS_protected);
+  else if (dwarf_version > 2
+	   && context_die->die_tag != DW_TAG_class_type)
+    add_AT_unsigned (die, DW_AT_accessibility, DW_ACCESS_private);
 }
 
 /* Generate a DIE for a class member.  */