diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/symtab.c | 18 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/list-ambiguous-readnow.exp | 22 |
4 files changed, 43 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ba071d5..4d9fa65 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2020-10-27 Tom de Vries <tdevries@suse.de> + * symtab.c (find_pc_sect_compunit_symtab): Include STATIC_BLOCK + symbols in section check. + +2020-10-27 Tom de Vries <tdevries@suse.de> + * symtab.c (find_pc_sect_compunit_symtab): Use early continue. 2020-10-27 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> diff --git a/gdb/symtab.c b/gdb/symtab.c index eda33a7..f6e2475 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/ChangeLog b/gdb/testsuite/ChangeLog index cf646c7..5bcb04d 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2020-10-27 Tom de Vries <tdevries@suse.de> + + * gdb.base/list-ambiguous-readnow.exp: New file. + 2020-10-27 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> * gdb.base/condbreak-multi-context.exp: Expand to test forcing 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 0000000..347a71b --- /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 +} |