[applied] dwarf-reader: Make die_peel_{qual_ptr,typedef} always set peeled type
Commit Message
Hello,
When die_peel_{qual_ptr,typedef} don't actually peel anything, they
don't set the peeled type output argument. So callers expecting that
argument to be set can be surprised by the fact the peeled argument
might not be set.
* src/abg-dwarf-reader.cc (die_peel_qual_ptr, die_peel_typedef):
If the function returned true, then set the peeled argument even
if the function hasn't peeled anything.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to the master branch.
---
src/abg-dwarf-reader.cc | 4 ++++
1 file changed, 4 insertions(+)
@@ -7136,6 +7136,8 @@ die_peel_qual_ptr(Dwarf_Die *die, Dwarf_Die& peeled_die)
else
return false;
+ memcpy(&peeled_die, die, sizeof(peeled_die));
+
while (tag == DW_TAG_const_type
|| tag == DW_TAG_volatile_type
|| tag == DW_TAG_restrict_type
@@ -7167,6 +7169,8 @@ die_peel_typedef(Dwarf_Die *die, Dwarf_Die& peeled_die)
int tag = dwarf_tag(die);
+ memcpy(&peeled_die, die, sizeof(peeled_die));
+
if (tag == DW_TAG_typedef)
{
if (!die_die_attribute(die, DW_AT_type, peeled_die))