Commit df8aeaef authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf symbols: Check SHT_RELA and SHT_REL type earlier 



Make the code more readable by checking for SHT_RELA and SHT_REL type
earlier.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarIan Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20230120123456.12449-11-adrian.hunter@intel.com


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

tools/perf/util/symbol-elf.c

+27 −27
Original line number Diff line number Diff line
@@ -434,6 +434,10 @@ int dso__synthesize_plt_symbols(struct dso *dso, struct symsrc *ss) 
			return 0;

	}



	if (shdr_rel_plt.sh_type != SHT_RELA &&

	    shdr_rel_plt.sh_type != SHT_REL)

		return 0;



	if (shdr_rel_plt.sh_link != dynsym_idx)

		goto out_elf_end;
@@ -466,8 +470,6 @@ int dso__synthesize_plt_symbols(struct dso *dso, struct symsrc *ss) 


	ri.is_rela = shdr_rel_plt.sh_type == SHT_RELA;



	if (shdr_rel_plt.sh_type == SHT_RELA ||

	    shdr_rel_plt.sh_type == SHT_REL) {

	for (idx = 0; idx < nr_rel_entries; idx++) {

		const char *elf_name = NULL;

		char *demangled = NULL;
@@ -476,7 +478,7 @@ int dso__synthesize_plt_symbols(struct dso *dso, struct symsrc *ss) 


		elf_name = elf_sym__name(&sym, symstrs);

		demangled = demangle_sym(dso, 0, elf_name);

			if (demangled != NULL)

		if (demangled)

			elf_name = demangled;

		if (*elf_name)

			snprintf(sympltname, sizeof(sympltname), "%s@plt", elf_name);
@@ -485,8 +487,7 @@ int dso__synthesize_plt_symbols(struct dso *dso, struct symsrc *ss) 
				 "offset_%#" PRIx64 "@plt", plt_offset);

		free(demangled);



			f = symbol__new(plt_offset, plt_entry_size,

					STB_GLOBAL, STT_FUNC, sympltname);

		f = symbol__new(plt_offset, plt_entry_size, STB_GLOBAL, STT_FUNC, sympltname);

		if (!f)

			goto out_elf_end;
@@ -494,7 +495,6 @@ int dso__synthesize_plt_symbols(struct dso *dso, struct symsrc *ss) 
		symbols__insert(&dso->symbols, f);

		++nr;

	}

	}



	err = 0;

out_elf_end: