gdb/linespec.c: Fix missing source file during breakpoint re-set
Commit Message
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, 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 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Comments
On 08/10/2022 01:44, Aaron Merey via Gdb-patches wrote:
> 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, 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 seems like a good change, and introduces no regressions.
Reviewed-By: Bruno Larsen <blarsen@redhat.com>
Cheers,
Bruno
> ---
> gdb/linespec.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gdb/linespec.c b/gdb/linespec.c
> index 3db35998f7e..805c98ca201 100644
> --- a/gdb/linespec.c
> +++ b/gdb/linespec.c
> @@ -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
@@ -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