[RFC v2 1/3] [gdb/symtab] Add find_symbol_for_pc_maybe_inline

Tom de Vries
2026-03-31T13:25:52Z

We have function find_symbol_for_pc:
...
find_symbol_for_pc (CORE_ADDR pc)
{
return find_symbol_for_pc_sect (pc, find_pc_mapped_section (pc));
}
...
which uses some standard way of getting the section for the given pc.

Add a similar function find_symbol_for_pc_maybe_inline that calls
find_symbol_for_pc_sect_maybe_inline, and use it in jump_command.

Tested on x86_64-linux.
---
gdb/blockframe.c | 8 ++++++++
gdb/infcmd.c | 3 +--
gdb/symtab.h | 6 ++++++
3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index 59efa391604..ce28d99c7e4 100644
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -152,6 +152,14 @@ find_symbol_for_pc (CORE_ADDR pc)

/* See symtab.h. */

+struct symbol *
+find_symbol_for_pc_maybe_inline (CORE_ADDR pc)
+{
+ return find_symbol_for_pc_sect_maybe_inline (pc, find_pc_mapped_section (pc));
+}
+
+/* See symtab.h. */
+
struct symbol *
find_symbol_for_pc_sect_maybe_inline (CORE_ADDR pc, struct obj_section *section)
{
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 9fbee5aaba7..2e1a4d592c1 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -1249,8 +1249,7 @@ jump_command (const char *arg, int from_tty)

/* See if we are trying to jump to another function. */
fn = get_frame_function (get_current_frame ());
- sfn = find_symbol_for_pc_sect_maybe_inline (sal.pc,
- find_pc_mapped_section (sal.pc));
+ sfn = find_symbol_for_pc_maybe_inline (sal.pc);
if (fn != nullptr && sfn != fn)
{
if (!query (_("Line %ps is not in `%ps'. Jump anyway? "),
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 8f0cc728410..132058a0065 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -2201,6 +2201,12 @@ extern struct type *lookup_enum (const char *, const struct block *);

extern struct symbol *find_symbol_for_pc (CORE_ADDR);

+/* Lookup the function symbol corresponding to the address. The return value
+ will be the closest enclosing function, which might be an inline
+ function. */
+
+extern struct symbol *find_symbol_for_pc_maybe_inline (CORE_ADDR pc);
+
/* lookup the function corresponding to the address and section. The
return value will not be an inlined function; the containing
function will be returned instead. */
--
2.51.0