From 7023b8d86c6f2403a4d7337e0b55fa9290181a06 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 6 Sep 2023 10:14:50 +0200 Subject: [PATCH] [gdb/symtab] Handle PU in iterate_over_some_symtabs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When running test-case gdb.base/setshow.exp with target board cc-with-dwz I run into: ... (gdb) info line 1^M Line 1 of "setshow.c" is at address 0x400527
but contains no code.^M Line 1 of "setshow.c" is at address 0x400527
but contains no code.^M (gdb) FAIL: gdb.base/setshow.exp: test_setshow_annotate: annotation_level 1 ... while the expected output is: ... Line 1 of "setshow.c" is at address 0x400527
but contains no code. ��setshow.c:1:0:beg:0x400527 ... The second line of the expected output is missing due to the first line of the expected output being repeated, so the problem is that the "Line 1" line is printed twice. This happens because the PU imported by the CU reuses the filetab of the CU, and both the CU and PU are visited by iterate_over_some_symtabs. Fix this by skipping PUs in iterate_over_some_symtabs. Tested on x86_64-linux, target boards unix, cc-with-dwz and cc-with-dwz-m. Approved-By: Tom Tromey PR symtab/30797 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30797 --- gdb/symtab.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gdb/symtab.c b/gdb/symtab.c index d8ce2bf8482..22c8b4204c6 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -575,6 +575,10 @@ iterate_over_some_symtabs (const char *name, for (cust = first; cust != NULL && cust != after_last; cust = cust->next) { + /* Skip included compunits. */ + if (cust->user != nullptr) + continue; + for (symtab *s : cust->filetabs ()) { if (compare_filenames_for_search (s->filename, name)) -- 2.30.2