gdb/linespec.c: Fix missing source file during breakpoint re-set
Commit Message
Ping. Reposting this patch with a couple tweaks suggested by Bruno.
During breakpoint re-setting, the source_filename of an
explicit_location_spec is used to lookup the symtabs associated with
the breakpoint being re-set. This source_filename is compared with each
known symtab filename in order to retrieve the breakpoint's symtabs.
However the source_filename may have been originally copied from a
symtab's fullname (the path where GDB found the source file) when the
breakpoint was first created. If a breakpoint symtab's filename and
fullname differ and there is no substitute-path rule that converts the
fullname to the filename, this will cause a NOT_FOUND_ERROR to be thrown
during re-setting.
Fix this by using a symtab's filename to set the explicit_location_spec
source_filename instead of the symtab's fullname.
---
gdb/linespec.c | 4 ++--
.../gdb.debuginfod/fetch_src_and_symbols.exp | 11 +++++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
@@ -2281,13 +2281,13 @@ convert_linespec_to_sals (struct linespec_state *state, linespec *ls)
/* Make sure we have a filename for canonicalization. */
if (ls->explicit_loc.source_filename == NULL)
{
- const char *fullname = symtab_to_fullname (state->default_symtab);
+ const char *filename = state->default_symtab->filename;
/* It may be more appropriate to keep DEFAULT_SYMTAB in its symtab
form so that displaying SOURCE_FILENAME can follow the current
FILENAME_DISPLAY_STRING setting. But as it is used only rarely
it has been kept for code simplicity only in absolute form. */
- ls->explicit_loc.source_filename = xstrdup (fullname);
+ ls->explicit_loc.source_filename = xstrdup (filename);
}
}
else
@@ -216,8 +216,15 @@ proc_with_prefix local_url { } {
$enable_debuginfod_question "y"
gdb_test_no_output "set substitute-path $outputdir /dev/null" \
"set substitute-path"
- gdb_test "br main" "Breakpoint 1 at.*file.*"
- gdb_test "l" ".*This program is distributed in the hope.*"
+ gdb_test "set cwd $debugdir" "" "file [file tail $binfile] cwd"
+ gdb_test "list 1" ".*This program is distributed in the hope.*"
+
+ # Verify that breakpoints re-set correctly when the actual location
+ # of the source file in the debuginfod client cache differs from
+ # the contents of DW_AT_comp_dir and DW_AT_name.
+ gdb_test "break 25" "Breakpoint 1 at.*file.*"
+ gdb_test "run" "Breakpoint 1,.*" \
+ "file [file tail $binfile] set breakpoint"
# GDB should now find the executable file.
clean_restart