[PATCH v4 15/25] perf annotate: Don't pass evsel to add_sample

Ian Rogers
2026-03-20T19:28:46Z

The sample contains the evsel so read it rather than pass it. Update
call site.

Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/builtin-annotate.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 041f5dc92ea8..894e57aa50cd 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -233,11 +233,11 @@ static bool has_annotation(struct perf_annotate *ann)
return ui__has_annotation() || ann->use_stdio2;
}

-static int evsel__add_sample(struct evsel *evsel, struct perf_sample *sample,
- struct addr_location *al, struct perf_annotate *ann,
- struct machine *machine)
+static int add_sample(struct perf_sample *sample,
+ struct addr_location *al, struct perf_annotate *ann,
+ struct machine *machine)
{
- struct hists *hists = evsel__hists(evsel);
+ struct hists *hists = evsel__hists(sample->evsel);
struct hist_entry *he;
int ret;

@@ -299,7 +299,7 @@ static int process_sample_event(const struct perf_tool *tool,
goto out_put;

if (!al.filtered &&
- evsel__add_sample(sample->evsel, sample, &al, ann, machine)) {
+ add_sample(sample, &al, ann, machine)) {
pr_warning("problem incrementing symbol count, "
"skipping event\n");
ret = -1;
--
2.53.0.959.g497ff81fa9-goog