libdw: Handle DWARF5 immutable, packed and shared in dwarf_peel_type.

Also update the documentation to explain that any type alias or modifier
that doesn't modify, change the structural layout or the way to access
the underlying type is peeled. Explicitly mention pointer and reference
types as examples of modifiers that don't obey that rule and so aren't
peeled.

Signed-off-by: Mark Wielaard <mark@klomp.org>

diff --git a/ChangeLog b/ChangeLog
index b4722db630fda947e76b3b0360372cc252f72fa2..b7efc847b9b0f835093fe5fc3263cbc952b03ce8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-07-26  Mark Wielaard  <mark@klomp.org>
+
+       * NEWS: Mention dwarf_peel_type DWARF5 tags improvement.
+
 2017-07-26  Mark Wielaard  <mark@klomp.org>
 
        * NEWS: Mention new DWARF5 calling conventions and defaulted member

diff --git a/NEWS b/NEWS
index 5f85fc26eb2947897d66f53de6d97b94603f8c3e..054ac95a4a030dd911e47799997c6605e1705e33 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Version 0.170
 libdw: Added new DWARF5 attribute, tag, character encoding, language code,
        calling convention and defaulted member function constants to dwarf.h.
        New function dwarf_default_lower_bound.
+       dwarf_peel_type now handles DWARF5 immutable, packed and shared tags.
 
 strip: Add -R, --remove-section=SECTION and --keep-section=SECTION.
 

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index a74733c29b7ebd4db73c20bd48cc32ae77921901..d0b3f4ca8e846746070c126734d659f7a249c595 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,9 @@
+2017-07-26  Mark Wielaard  <mark@klomp.org>
+
+       * dwarf_peel_type.c (dwarf_peel_type): Handle DW_TAG_immutable_type,
+       DW_TAG_packed_type and DW_TAG_shared_type.
+       * libdw.h (dwarf_peel_type): Extend documentation.
+
 2017-07-26  Mark Wielaard  <mark@klomp.org>
 
        * dwarf.h: Add DW_DEFAULTED_no, DW_DEFAULTED_in_class and

diff --git a/libdw/dwarf_peel_type.c b/libdw/dwarf_peel_type.c
index 97356944676023647b5cacf9610a4fe9ffa6bc9c..6bbfd42407c6995b36195517ac9abbc019928f08 100644 (file)
--- a/libdw/dwarf_peel_type.c
+++ b/libdw/dwarf_peel_type.c
@@ -1,5 +1,5 @@
 /* Peel type aliases and qualifier tags from a type DIE.
-   Copyright (C) 2014, 2015 Red Hat, Inc.
+   Copyright (C) 2014, 2015, 2016 Red Hat, Inc.
    This file is part of elfutils.
 
    This file is free software; you can redistribute it and/or modify
@@ -50,7 +50,10 @@ dwarf_peel_type (Dwarf_Die *die, Dwarf_Die *result)
         || tag == DW_TAG_const_type
         || tag == DW_TAG_volatile_type
         || tag == DW_TAG_restrict_type
-        || tag == DW_TAG_atomic_type)
+        || tag == DW_TAG_atomic_type
+        || tag == DW_TAG_immutable_type
+        || tag == DW_TAG_packed_type
+        || tag == DW_TAG_shared_type)
     {
       Dwarf_Attribute attr_mem;
       Dwarf_Attribute *attr = INTUSE (dwarf_attr_integrate) (result, DW_AT_type,

diff --git a/libdw/libdw.h b/libdw/libdw.h
index 49c4ebb9320c794a4528d41c6f75284faf40814d..63a38ff986bcb971dd5e5e80a1068465b6fbb573 100644 (file)
--- a/libdw/libdw.h
+++ b/libdw/libdw.h
@@ -1,5 +1,5 @@
 /* Interfaces for libdw.
-   Copyright (C) 2002-2010, 2013, 2014 Red Hat, Inc.
+   Copyright (C) 2002-2010, 2013, 2014, 2016 Red Hat, Inc.
    This file is part of elfutils.
 
    This file is free software; you can redistribute it and/or modify
@@ -378,8 +378,11 @@ extern int dwarf_child (Dwarf_Die *die, Dwarf_Die *result)
 extern int dwarf_siblingof (Dwarf_Die *die, Dwarf_Die *result)
      __nonnull_attribute__ (2);
 
-/* For type aliases and qualifier type DIEs follow the DW_AT_type
-   attribute (recursively) and return the underlying type Dwarf_Die.
+/* For type aliases and qualifier type DIEs, which don't modify or
+   change the structural layout of the underlying type, follow the
+   DW_AT_type attribute (recursively) and return the underlying type
+   Dwarf_Die.
+
    Returns 0 when RESULT contains a Dwarf_Die (possibly equal to the
    given DIE) that isn't a type alias or qualifier type.  Returns 1
    when RESULT contains a type alias or qualifier Dwarf_Die that
@@ -387,13 +390,18 @@ extern int dwarf_siblingof (Dwarf_Die *die, Dwarf_Die *result)
    attribute).  Returns -1 when an error occured.
 
    The current DWARF specification defines one type alias tag
-   (DW_TAG_typedef) and three qualifier type tags (DW_TAG_const_type,
-   DW_TAG_volatile_type, DW_TAG_restrict_type).  DWARF5 defines one
-   other qualifier type tag (DW_TAG_atomic_type).  A future version of
-   this function might peel other alias or qualifier type tags if a
-   future DWARF version or GNU extension defines other type aliases or
-   qualifier type tags that don't modify or change the structural
-   layout of the underlying type.  */
+   (DW_TAG_typedef) and seven modifier/qualifier type tags
+   (DW_TAG_const_type, DW_TAG_volatile_type, DW_TAG_restrict_type,
+   DW_TAG_atomic_type, DW_TAG_immutable_type, DW_TAG_packed_type and
+   DW_TAG_shared_type).  This function won't peel modifier type
+   tags that change the way the underlying type is accessed such
+   as the pointer or reference type tags (DW_TAG_pointer_type,
+   DW_TAG_reference_type or DW_TAG_rvalue_reference_type).
+
+   A future version of this function might peel other alias or
+   qualifier type tags if a future DWARF version or GNU extension
+   defines other type aliases or qualifier type tags that don't modify,
+   change the structural layout or the way to access the underlying type.  */
 extern int dwarf_peel_type (Dwarf_Die *die, Dwarf_Die *result)
     __nonnull_attribute__ (2);