perf probe: Use dwarf_attr_integrate as generic DWARF attr accessor

Use dwarf_attr_integrate() instead of dwarf_attr() for generic attribute
acccessor functions, so that it can find the specified attribute from
abstact origin DIE etc.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Link: https://lore.kernel.org/r/166731051988.2100653.13595339994343449770.stgit@devnote3
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c
index 406b7bd..216fc3d 100644 (file)
--- a/tools/perf/util/dwarf-aux.c
+++ b/tools/perf/util/dwarf-aux.c
@@ -308,7 +308,7 @@ static int die_get_attr_udata(Dwarf_Die *tp_die, unsigned int attr_name,
 {
        Dwarf_Attribute attr;
 
-       if (dwarf_attr(tp_die, attr_name, &attr) == NULL ||
+       if (dwarf_attr_integrate(tp_die, attr_name, &attr) == NULL ||
            dwarf_formudata(&attr, result) != 0)
                return -ENOENT;
 
@@ -321,7 +321,7 @@ static int die_get_attr_sdata(Dwarf_Die *tp_die, unsigned int attr_name,
 {
        Dwarf_Attribute attr;
 
-       if (dwarf_attr(tp_die, attr_name, &attr) == NULL ||
+       if (dwarf_attr_integrate(tp_die, attr_name, &attr) == NULL ||
            dwarf_formsdata(&attr, result) != 0)
                return -ENOENT;