Commit b508965d authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf dwarf-aux: Remove unused pc argument 



It's not used, let's get rid of it.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Reviewed-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/r/20240319055115.4063940-2-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 71bc3ac8

tools/perf/util/annotate-data.c

+2 −2
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static int find_data_type_die(struct debuginfo *di, u64 pc, u64 addr, 
	offset = loc->offset;



	if (reg == DWARF_REG_PC) {

		if (die_find_variable_by_addr(&cu_die, pc, addr, &var_die, &offset)) {

		if (die_find_variable_by_addr(&cu_die, addr, &var_die, &offset)) {

			ret = check_variable(&var_die, type_die, offset,

					     /*is_pointer=*/false);

			loc->offset = offset;
@@ -312,7 +312,7 @@ static int find_data_type_die(struct debuginfo *di, u64 pc, u64 addr, 
	/* Search from the inner-most scope to the outer */

	for (i = nr_scopes - 1; i >= 0; i--) {

		if (reg == DWARF_REG_PC) {

			if (!die_find_variable_by_addr(&scopes[i], pc, addr,

			if (!die_find_variable_by_addr(&scopes[i], addr,

						       &var_die, &offset))

				continue;

		} else {

tools/perf/util/dwarf-aux.c

+2 −5
Original line number Diff line number Diff line
@@ -1456,7 +1456,6 @@ static int __die_find_var_addr_cb(Dwarf_Die *die_mem, void *arg) 
/**

 * die_find_variable_by_addr - Find variable located at given address

 * @sc_die: a scope DIE

 * @pc: the program address to find

 * @addr: the data address to find

 * @die_mem: a buffer to save the resulting DIE

 * @offset: the offset in the resulting type
@@ -1464,12 +1463,10 @@ static int __die_find_var_addr_cb(Dwarf_Die *die_mem, void *arg) 
 * Find the variable DIE located at the given address (in PC-relative mode).

 * This is usually for global variables.

 */

Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_die, Dwarf_Addr pc,

				     Dwarf_Addr addr, Dwarf_Die *die_mem,

				     int *offset)

Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_die, Dwarf_Addr addr,

				     Dwarf_Die *die_mem, int *offset)

{

	struct find_var_data data = {

		.pc = pc,

		.addr = addr,

	};

	Dwarf_Die *result;

tools/perf/util/dwarf-aux.h

+2 −4
Original line number Diff line number Diff line
@@ -146,9 +146,8 @@ Dwarf_Die *die_find_variable_by_reg(Dwarf_Die *sc_die, Dwarf_Addr pc, int reg, 
				    Dwarf_Die *die_mem);



/* Find a (global) variable located in the 'addr' */

Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_die, Dwarf_Addr pc,

				     Dwarf_Addr addr, Dwarf_Die *die_mem,

				     int *offset);

Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_die, Dwarf_Addr addr,

				     Dwarf_Die *die_mem, int *offset);



#else /*  HAVE_DWARF_GETLOCATIONS_SUPPORT */
@@ -170,7 +169,6 @@ static inline Dwarf_Die *die_find_variable_by_reg(Dwarf_Die *sc_die __maybe_unus 
}



static inline Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_die __maybe_unused,

						   Dwarf_Addr pc __maybe_unused,

						   Dwarf_Addr addr __maybe_unused,

						   Dwarf_Die *die_mem __maybe_unused,

						   int *offset __maybe_unused)