Commit f759b4c5 authored Nov 01, 2022 by Masami Hiramatsu (Google) Committed by Greg Kroah-Hartman Jan 18, 2023

perf probe: Use dwarf_attr_integrate as generic DWARF attr accessor



[ Upstream commit f828929ab7f0dc3353e4a617f94f297fa8f3dec3 ]

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>
Stable-dep-of: a9dfc46c67b5 ("perf probe: Fix to get the DW_AT_decl_file and DW_AT_call_file as unsinged data")
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent d3c61219

tools/perf/util/dwarf-aux.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -267,7 +267,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;

		@@ -280,7 +280,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;