mirror of
git://sourceware.org/git/libabigail.git
synced 2024-12-17 07:24:34 +00:00
Use dwarf_attr_integrate() rather than dwarf_attr()
* src/abg-dwarf-reader.cc (die_string_attribute) (die_unsigned_constant_attribute, die_signed_constant_attribute) (die_flag_attribute, die_die_attribute): Use dwarf_attr_integrate rather than dwarf_attr to look through DW_AT_abstract_origin. Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
parent
3b59c769ab
commit
92687c6a1c
@ -292,7 +292,7 @@ die_string_attribute(Dwarf_Die* die, unsigned attr_name)
|
||||
return "";
|
||||
|
||||
Dwarf_Attribute attr;
|
||||
if (!dwarf_attr(die, attr_name, &attr))
|
||||
if (!dwarf_attr_integrate(die, attr_name, &attr))
|
||||
return "";
|
||||
|
||||
const char* str = dwarf_formstring(&attr);
|
||||
@ -322,7 +322,7 @@ die_unsigned_constant_attribute(Dwarf_Die* die,
|
||||
|
||||
Dwarf_Attribute attr;
|
||||
Dwarf_Word result = 0;
|
||||
if (!dwarf_attr(die, attr_name, &attr)
|
||||
if (!dwarf_attr_integrate(die, attr_name, &attr)
|
||||
|| dwarf_formudata(&attr, &result))
|
||||
return false;
|
||||
|
||||
@ -353,7 +353,7 @@ die_signed_constant_attribute(Dwarf_Die* die,
|
||||
|
||||
Dwarf_Attribute attr;
|
||||
Dwarf_Sword result = 0;
|
||||
if (!dwarf_attr(die, attr_name, &attr)
|
||||
if (!dwarf_attr_integrate(die, attr_name, &attr)
|
||||
|| dwarf_formsdata(&attr, &result))
|
||||
return false;
|
||||
|
||||
@ -380,7 +380,7 @@ die_flag_attribute(Dwarf_Die* die, unsigned attr_name, bool& flag)
|
||||
{
|
||||
Dwarf_Attribute attr;
|
||||
bool f = false;
|
||||
if (!dwarf_attr(die, attr_name, &attr)
|
||||
if (!dwarf_attr_integrate(die, attr_name, &attr)
|
||||
|| dwarf_formflag(&attr, &f))
|
||||
return false;
|
||||
|
||||
@ -443,7 +443,7 @@ static bool
|
||||
die_die_attribute(Dwarf_Die* die, unsigned attr_name, Dwarf_Die& result)
|
||||
{
|
||||
Dwarf_Attribute attr;
|
||||
if (!dwarf_attr(die, attr_name, &attr))
|
||||
if (!dwarf_attr_integrate(die, attr_name, &attr))
|
||||
return false;
|
||||
return dwarf_formref_die(&attr, &result);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user