diff --git a/gdb/linespec.c b/gdb/linespec.c index cedbd39bd7..e902b11c8e 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -2102,16 +2102,14 @@ create_sals_line_offset (struct linespec_state *self, if (ls->file_symtabs->size () == 1 && ls->file_symtabs->front () == nullptr) { - const char *fullname; - set_current_program_space (self->program_space); /* Make sure we have at least a default source line. */ set_default_source_symtab_and_line (); initialize_defaults (&self->default_symtab, &self->default_line); - fullname = symtab_to_fullname (self->default_symtab); *ls->file_symtabs - = collect_symtabs_from_filename (fullname, self->search_pspace); + = collect_symtabs_from_filename (self->default_symtab->filename, + self->search_pspace); use_default = 1; } diff --git a/gdb/testsuite/gdb.base/symlink-sourcefile.c b/gdb/testsuite/gdb.base/symlink-sourcefile.c new file mode 100644 index 0000000000..12cd96892a --- /dev/null +++ b/gdb/testsuite/gdb.base/symlink-sourcefile.c @@ -0,0 +1,26 @@ +/* Copyright 2019 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 . */ + +static int +foo (void) +{ + return 0; /* break here */ +} + +int +main (void) +{ + return foo (); +} diff --git a/gdb/testsuite/gdb.base/symlink-sourcefile.exp b/gdb/testsuite/gdb.base/symlink-sourcefile.exp new file mode 100644 index 0000000000..ae43934ff4 --- /dev/null +++ b/gdb/testsuite/gdb.base/symlink-sourcefile.exp @@ -0,0 +1,45 @@ +# Copyright 2019 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 . + +# Test that GDB can find the default symtab when it is a symbolic link. +standard_testfile + +set test "file symbolic link name" +set linksrc "link-${srcfile}" +set srcfilelink [standard_output_file $linksrc] + + +# Remove any existing symlink and build executable using a +# symbolic link to the actual source file. +remote_file host delete $srcfilelink +set status [remote_exec host \ + "ln -sf $srcdir/$subdir/$srcfile $srcfilelink"] +if {[lindex $status 0] != 0} { + unsupported "$test (host does not support symbolic links)" + return 0 +} + +if {[prepare_for_testing $testfile $testfile $srcfilelink]} { + return -1 +} + +if {![runto_main]} { + untested "could not run to main" + return -1 +} + +# Using a line number ensures that the default symtab is used. +gdb_breakpoint [gdb_get_line_number "break here" $srcfile] message +gdb_continue_to_breakpoint "run to breakpoint marker"