* [committed][gdb/testsuite] Fix section matching in find_pc_sect_compunit_symtab
@ 2020-10-27 12:31 Tom de Vries
2020-10-27 12:31 ` Tom de Vries
0 siblings, 1 reply; 2+ messages in thread
From: Tom de Vries @ 2020-10-27 12:31 UTC (permalink / raw)
To: gdb-patches
Hi,
When running test-case gdb.base/list-ambiguous.exp with target board readnow,
we run into:
...
FAIL: gdb.base/list-ambiguous.exp: list ambiguous_fun
...
The test-case contains two static functions ambiguous_fun, one in
list-ambiguous0.c and one in list-ambiguous1.c.
The list command is supposed to show both, but only the one from
list-ambiguous0.c is shown.
This is due to the section check in find_pc_sect_compunit_symtab. It checks
whether the candidate compunit_symtab contains a symbol that has the required
section. This check is only done for GLOBAL_BLOCK symbols.
The check succeeds for the compunit_symtab for list-ambiguous0.c, because it
contains main, but it fails for list-ambiguous0.c because it has no global
symbols.
Fix this by extending the section check to STATIC_BLOCK symbols.
Tested on x86_64-linux.
Committed to trunk.
Thanks,
- Tom
[gdb/testsuite] Fix section matching in find_pc_sect_compunit_symtab
gdb/ChangeLog:
2020-10-27 Tom de Vries <tdevries@suse.de>
* symtab.c (find_pc_sect_compunit_symtab): Include STATIC_BLOCK
symbols in section check.
gdb/testsuite/ChangeLog:
2020-10-27 Tom de Vries <tdevries@suse.de>
* gdb.base/list-ambiguous-readnow.exp: New file.
---
gdb/symtab.c | 18 ++++++++++++------
gdb/testsuite/gdb.base/list-ambiguous-readnow.exp | 22 ++++++++++++++++++++++
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/gdb/symtab.c b/gdb/symtab.c
index eda33a7eb4..f6e2475800 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -2954,13 +2954,19 @@ find_pc_sect_compunit_symtab (CORE_ADDR pc, struct obj_section *section)
struct symbol *sym = NULL;
struct block_iterator iter;
- ALL_BLOCK_SYMBOLS (global_block, iter, sym)
+ for (int b_index = GLOBAL_BLOCK;
+ b_index <= STATIC_BLOCK && sym == NULL;
+ ++b_index)
{
- fixup_symbol_section (sym, obj_file);
- if (matching_obj_sections (SYMBOL_OBJ_SECTION (obj_file,
- sym),
- section))
- break;
+ const struct block *b = BLOCKVECTOR_BLOCK (bv, b_index);
+ ALL_BLOCK_SYMBOLS (b, iter, sym)
+ {
+ fixup_symbol_section (sym, obj_file);
+ if (matching_obj_sections (SYMBOL_OBJ_SECTION (obj_file,
+ sym),
+ section))
+ break;
+ }
}
if (sym == NULL)
continue; /* No symbol in this symtab matches
diff --git a/gdb/testsuite/gdb.base/list-ambiguous-readnow.exp b/gdb/testsuite/gdb.base/list-ambiguous-readnow.exp
new file mode 100644
index 0000000000..347a71ba52
--- /dev/null
+++ b/gdb/testsuite/gdb.base/list-ambiguous-readnow.exp
@@ -0,0 +1,22 @@
+# Copyright 2020 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Run list-ambiguous.exp with -readnow.
+
+save_vars { GDBFLAGS } {
+ append GDBFLAGS " -readnow"
+
+ source $srcdir/$subdir/list-ambiguous.exp
+}
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [committed][gdb/testsuite] Fix section matching in find_pc_sect_compunit_symtab
2020-10-27 12:31 [committed][gdb/testsuite] Fix section matching in find_pc_sect_compunit_symtab Tom de Vries
@ 2020-10-27 12:31 ` Tom de Vries
0 siblings, 0 replies; 2+ messages in thread
From: Tom de Vries @ 2020-10-27 12:31 UTC (permalink / raw)
To: gdb-patches
[ Sorry, this should have been: gdb/symtab. ]
On 10/27/20 1:31 PM, Tom de Vries wrote:
> Hi,
>
> When running test-case gdb.base/list-ambiguous.exp with target board readnow,
> we run into:
> ...
> FAIL: gdb.base/list-ambiguous.exp: list ambiguous_fun
> ...
>
> The test-case contains two static functions ambiguous_fun, one in
> list-ambiguous0.c and one in list-ambiguous1.c.
>
> The list command is supposed to show both, but only the one from
> list-ambiguous0.c is shown.
>
> This is due to the section check in find_pc_sect_compunit_symtab. It checks
> whether the candidate compunit_symtab contains a symbol that has the required
> section. This check is only done for GLOBAL_BLOCK symbols.
>
> The check succeeds for the compunit_symtab for list-ambiguous0.c, because it
> contains main, but it fails for list-ambiguous0.c because it has no global
> symbols.
>
> Fix this by extending the section check to STATIC_BLOCK symbols.
>
> Tested on x86_64-linux.
>
> Committed to trunk.
>
> Thanks,
> - Tom
>
> [gdb/testsuite] Fix section matching in find_pc_sect_compunit_symtab
>
> gdb/ChangeLog:
>
> 2020-10-27 Tom de Vries <tdevries@suse.de>
>
> * symtab.c (find_pc_sect_compunit_symtab): Include STATIC_BLOCK
> symbols in section check.
>
> gdb/testsuite/ChangeLog:
>
> 2020-10-27 Tom de Vries <tdevries@suse.de>
>
> * gdb.base/list-ambiguous-readnow.exp: New file.
>
> ---
> gdb/symtab.c | 18 ++++++++++++------
> gdb/testsuite/gdb.base/list-ambiguous-readnow.exp | 22 ++++++++++++++++++++++
> 2 files changed, 34 insertions(+), 6 deletions(-)
>
> diff --git a/gdb/symtab.c b/gdb/symtab.c
> index eda33a7eb4..f6e2475800 100644
> --- a/gdb/symtab.c
> +++ b/gdb/symtab.c
> @@ -2954,13 +2954,19 @@ find_pc_sect_compunit_symtab (CORE_ADDR pc, struct obj_section *section)
> struct symbol *sym = NULL;
> struct block_iterator iter;
>
> - ALL_BLOCK_SYMBOLS (global_block, iter, sym)
> + for (int b_index = GLOBAL_BLOCK;
> + b_index <= STATIC_BLOCK && sym == NULL;
> + ++b_index)
> {
> - fixup_symbol_section (sym, obj_file);
> - if (matching_obj_sections (SYMBOL_OBJ_SECTION (obj_file,
> - sym),
> - section))
> - break;
> + const struct block *b = BLOCKVECTOR_BLOCK (bv, b_index);
> + ALL_BLOCK_SYMBOLS (b, iter, sym)
> + {
> + fixup_symbol_section (sym, obj_file);
> + if (matching_obj_sections (SYMBOL_OBJ_SECTION (obj_file,
> + sym),
> + section))
> + break;
> + }
> }
> if (sym == NULL)
> continue; /* No symbol in this symtab matches
> diff --git a/gdb/testsuite/gdb.base/list-ambiguous-readnow.exp b/gdb/testsuite/gdb.base/list-ambiguous-readnow.exp
> new file mode 100644
> index 0000000000..347a71ba52
> --- /dev/null
> +++ b/gdb/testsuite/gdb.base/list-ambiguous-readnow.exp
> @@ -0,0 +1,22 @@
> +# Copyright 2020 Free Software Foundation, Inc.
> +
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 3 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program. If not, see <http://www.gnu.org/licenses/>.
> +
> +# Run list-ambiguous.exp with -readnow.
> +
> +save_vars { GDBFLAGS } {
> + append GDBFLAGS " -readnow"
> +
> + source $srcdir/$subdir/list-ambiguous.exp
> +}
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-27 12:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-27 12:31 [committed][gdb/testsuite] Fix section matching in find_pc_sect_compunit_symtab Tom de Vries
2020-10-27 12:31 ` Tom de Vries
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox