espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-18 16:53:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb/linespec.c: Fix missing source file during breakpoint re-set

Browse Source 
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.
This commit is contained in:
Aaron Merey
2023-01-06 18:45:27 -05:00
parent 2ff63a29b0
commit 7dd38e31d6
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/linespec.c
View File

@ -2283,13 +2283,13 @@ convert_linespec_to_sals (struct linespec_state *state, linespec *ls)
/* Make sure we have a filename for canonicalization. */ /* Make sure we have a filename for canonicalization. */
if (ls->explicit_loc.source_filename == NULL) 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 /* It may be more appropriate to keep DEFAULT_SYMTAB in its symtab
form so that displaying SOURCE_FILENAME can follow the current form so that displaying SOURCE_FILENAME can follow the current
FILENAME_DISPLAY_STRING setting. But as it is used only rarely FILENAME_DISPLAY_STRING setting. But as it is used only rarely
it has been kept for code simplicity only in absolute form. */ 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 else

9
gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
View File

@ -224,6 +224,15 @@ proc_with_prefix local_url { } {
set lineno [gdb_get_line_number "Breakpoint here"] set lineno [gdb_get_line_number "Breakpoint here"]
gdb_test "list $lineno" "return 0;\[^\r\n\]+Breakpoint here\\. .*" gdb_test "list $lineno" "return 0;\[^\r\n\]+Breakpoint here\\. .*"
# Verify that a breakpoint re-sets 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 "set cwd $debugdir" "" "file [file tail $binfile] cwd"
gdb_test_no_output "del breakpoint 1"
gdb_test "break $lineno" "Breakpoint 2 at.*file.*"
gdb_test "run" "Breakpoint 2.*" \
"file [file tail $binfile] set breakpoint"
# GDB should now find the executable file. # GDB should now find the executable file.
clean_restart clean_restart
gdb_test "core $::corefile" ".*return 0.*" "file [file tail $::corefile]" \ gdb_test "core $::corefile" ".*return 0.*" "file [file tail $::corefile]" \