Skip to contentSkip to conversation

perf annotate TUI browser: Do not use member from variable within its own initialization

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message May 30, 2019 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  da2019633f0b5c105ce658aada333422d8cb28fe
Gitweb:     https://git.kernel.org/tip/da2019633f0b5c105ce658aada333422d8cb28fe
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 28 May 2019 16:02:56 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 28 May 2019 18:37:44 -0300

perf annotate TUI browser: Do not use member from variable within its own initialization

Some compilers will complain when using a member of a struct to initialize another member, in the same struct initialization.

For instance:

debian:8 Debian clang version 3.5.0-10 (tags/RELEASE_350/final) (based on LLVM 3.5.0)
oraclelinux:7 clang version 3.4.2 (tags/RELEASE_34/dot2-final)

Produce:

ui/browsers/annotate.c:104:12: error: variable 'ops' is uninitialized when used within its own initialization [-Werror,-Wuninitialized]

                                              (!ops.current_entry ||
                                                ^~~

1 error generated.

So use an extra variable, initialized just before that struct, to have the value used in the expressions used to init two of the struct members.

Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Fixes c298304bd747 ("perf annotate: Use a ops table for annotation_line__write()")
---
 tools/perf/ui/browsers/annotate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
tools/perf/ui/browsers/annotate.c +3 -2
index 98d934a36d86..b0d089a95dac 100644
@@ -97,11 +97,12 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
 	struct annotate_browser *ab = container_of(browser, struct annotate_browser, b);
 	struct annotation *notes = browser__annotation(browser);
 	struct annotation_line *al = list_entry(entry, struct annotation_line, node);
+	const bool is_current_entry = ui_browser__is_current_entry(browser, row);
 	struct annotation_write_ops ops = {
 		.first_line		 = row == 0,
-		.current_entry		 = ui_browser__is_current_entry(browser, row),
+		.current_entry		 = is_current_entry,
 		.change_color		 = (!notes->options->hide_src_code &&
-					    (!ops.current_entry ||
+					    (!is_current_entry ||
 					     (browser->use_navkeypressed &&
 					      !browser->navkeypressed))),
 		.width			 = browser->width,