aboutsummaryrefslogtreecommitdiff
path: root/gdb/linespec.c
diff options
context:
space:
mode:
authorKeith Seitz <keiths@redhat.com>2019-02-22 09:39:35 -0800
committerKeith Seitz <keiths@redhat.com>2019-02-22 11:19:27 -0800
commitbb995d00b3eef2f48d0be895c3509a7ddd8280a1 (patch)
treee332deafbabc16ade03e0bf10c2664a67178b923 /gdb/linespec.c
parent24841daa74f092f7c5639ee8f1fb303c7694dee7 (diff)
downloadfsf-binutils-gdb-bb995d00b3eef2f48d0be895c3509a7ddd8280a1.zip
fsf-binutils-gdb-bb995d00b3eef2f48d0be895c3509a7ddd8280a1.tar.gz
fsf-binutils-gdb-bb995d00b3eef2f48d0be895c3509a7ddd8280a1.tar.bz2
Fix symtab/23853: symlinked default symtab
This patch attempts to fix a bug dealing with setting breakpoints in default symtabs that are symlinks. For example: (gdb) list 11 GNU General Public License for more details. 12 13 You should have received a copy of the GNU General Public License 14 along with this program. If not, see <http://www.gnu.org/licenses/>. */ 15 16 static int 17 foo (void) 18 { 19 return 0; /* break here */ 20 } (gdb) 21 22 int 23 main (void) 24 { 25 return foo (); 26 } (gdb) b 19 No line 19 in the current file. Make breakpoint pending on future shared library load? (y or [n]) The problem here is that when create_sals_line_offset sets the default symtab, it immediately calls symtab_to_fullname, passing that fullname to collect_symtabs_from_filename to find all matching symtabs. This fails because we end up looking for a symtab with the name of the actual file on disk (which is different in this case because of the symlink) instead of the one stored in the debug info. Since we already have the lookup name of the default symtab, use it instead of the fullname. [This fullname thing was originally added in 2007 in a series dealing with *displaying* absolute file names. Clearly, this instance has nothing to do with the display of file names.] gdb/ChangeLog PR symtab/23853 * linespec.c (create_sals_line_offset): Search for the default symtab's filename instead of its fullname. gdb/testsuite/ChangeLog PR symtab/23853 * gdb.base/symlink-sourcefile.c: New file. * gdb.base/symlink-sourcefile.exp: New file.
Diffstat (limited to 'gdb/linespec.c')
-rw-r--r--gdb/linespec.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/gdb/linespec.c b/gdb/linespec.c
index cedbd39..e902b11 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;
}