[patch+7.3] gdbindex regression: stabs forgotten [Fix crash of gdb save-index on a STABS file]

Jan Kratochvil
2011-04-17T16:32:00Z

On Thu, 14 Apr 2011 22:44:28 +0200, Tom Tromey wrote:
> >>>>> "Jan" == Jan Kratochvil <jan.kratochvil@redhat.com> writes:
>
> Jan> There are some concerns what is a file uses both DWARF and STABS,
> Jan> it may possibly currently have a regression with .gdb_index. But
> Jan> that is unrelated to this patch.
>
> I think it should all work. At least, I designed it to.
[...]
> On the reader side, the code in elfread.c is written to read STABS
> first -- and skip using the index if any are found. This handles the
> problem that an objfile can only have one set of quick functions.

I do not see it implemented. This is a regression.

No regressions on {x86_64,x86_64-m32,i686}-fedora15-linux-gnu and with
cc-with-index.sh (where it turns FAIL->PASS).

Thanks,
Jan

gdb/
2011-04-17 Jan Kratochvil <jan.kratochvil@redhat.com>

* elfread.c (elf_symfile_read): Protect dwarf2_initialize_objfile by
!objfile_has_partial_symbols. New comment.
* objfiles.c (objfile_has_partial_symbols): Call HAS_SYMBOLS if
SYM_READ_PSYMBOLS is not present.

gdb/testsuite/
2011-04-17 Jan Kratochvil <jan.kratochvil@redhat.com>

* gdb.base/gdbindex-stabs-dwarf.c: New file.
* gdb.base/gdbindex-stabs.c: New file.
* gdb.base/gdbindex-stabs.exp: New file.

--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -1375,7 +1375,12 @@ elf_symfile_read (struct objfile *objfile, int symfile_flags)

if (dwarf2_has_info (objfile))
{
- if (dwarf2_initialize_objfile (objfile))
+ /* elf_sym_fns_gdb_index cannot handle simultaneous non-DWARF debug
+ information present in OBJFILE. If there is such debug info present
+ never use .gdb_index. */
+
+ if (!objfile_has_partial_symbols (objfile)
+ && dwarf2_initialize_objfile (objfile))
objfile->sf = &elf_sym_fns_gdb_index;
else
{
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -909,8 +909,9 @@ objfile_has_partial_symbols (struct objfile *objfile)
/* If we have not read psymbols, but we have a function capable of
reading them, then that is an indication that they are in fact
available. */
- if ((objfile->flags & OBJF_PSYMTABS_READ) == 0)
- return objfile->sf->sym_read_psymbols != NULL;
+ if ((objfile->flags & OBJF_PSYMTABS_READ) == 0
+ && objfile->sf->sym_read_psymbols != NULL)
+ return 1;
return objfile->sf->qf->has_symbols (objfile);
}

--- /dev/null
+++ b/gdb/testsuite/gdb.base/gdbindex-stabs-dwarf.c
@@ -0,0 +1,25 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2011 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/>. */
+
+extern void stabs_function (void);
+
+int
+main (void)
+{
+ stabs_function ();
+ return 0;
+}
--- /dev/null
+++ b/gdb/testsuite/gdb.base/gdbindex-stabs.c
@@ -0,0 +1,21 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2011 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/>. */
+
+void
+stabs_function (void) /* marker-here */
+{
+}
--- /dev/null
+++ b/gdb/testsuite/gdb.base/gdbindex-stabs.exp
@@ -0,0 +1,36 @@
+# Copyright (C) 2011 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/>.
+
+# This problem is reproducible only when using `gdb/cc-with-index.sh'.
+
+set testfile gdbindex-stabs
+set executable ${testfile}
+set binfile ${objdir}/${subdir}/${executable}
+set srcfile_stabs ${testfile}.c
+set srcfile_dwarf ${testfile}-dwarf.c
+set objfile_stabs ${testfile}.o
+set objfile_dwarf ${testfile}-dwarf.o
+
+if {[gdb_compile "${srcdir}/${subdir}/${srcfile_stabs}" ${objfile_stabs} object {additional_flags=-gstabs}] != ""
+ || [gdb_compile "${srcdir}/${subdir}/${srcfile_dwarf}" ${objfile_dwarf} object {additional_flags=-gdwarf-2}] != ""
+ || [gdb_compile "${objfile_stabs} ${objfile_dwarf}" ${binfile} executable {nodebug}] != ""} {
+ untested ${testfile}.exp
+ return -1
+}
+
+clean_restart ${executable}
+
+# FAIL was: No line number known for stabs_function.
+gdb_test "list stabs_function" " marker-here .*"