public inbox for
 help / color / mirror / Atom feed
From: Aaron Merey <>
Subject: [PATCH] gdb/linespec.c: Fix missing source file during breakpoint re-set
Date: Fri, 21 Oct 2022 13:07:20 -0400	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

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(-)

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);
diff --git a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
index 9bffb3397ec..a6575f033e0 100644
--- a/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
+++ b/gdb/testsuite/gdb.debuginfod/fetch_src_and_symbols.exp
@@ -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.

  reply	other threads:[~2022-10-21 17:07 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-07 23:44 Aaron Merey
2022-10-10 16:06 ` Bruno Larsen
2022-10-12 20:49 ` Aaron Merey
2022-10-13  7:59   ` Bruno Larsen
2022-10-14  0:47     ` Aaron Merey
2022-10-21 17:07       ` Aaron Merey [this message]
2023-01-06 23:56         ` [PING*2][PATCH] " Aaron Merey
2023-01-09 19:27           ` Tom Tromey
2023-01-10  1:15             ` Aaron Merey
2023-02-01 17:37           ` Andrew Burgess
2023-01-09 19:27   ` [PATCH] " Tom Tromey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).