[PATCH] Remove parameter from select_source_symtab

[PATCH] Remove parameter from select_source_symtab

[Tom Tromey]

I noticed that select_source_symtab is only ever called with nullptr
as an argument, so this patch removes the parameter and associated
logic.
---
 gdb/source.c | 16 ++++------------
 gdb/source.h | 14 ++++++--------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/gdb/source.c b/gdb/source.c
index 4d297c82ea9..98d02d45448 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -266,7 +266,7 @@ set_default_source_symtab_and_line (void)
   /* Pull in a current source symtab if necessary.  */
   current_source_location *loc = get_source_location (current_program_space);
   if (loc->symtab () == nullptr)
-    select_source_symtab (0);
+    select_source_symtab ();
 }
 
 /* Return the current default file for listing and next line to list
@@ -307,16 +307,8 @@ clear_current_source_symtab_and_line (void)
 /* See source.h.  */
 
 void
-select_source_symtab (struct symtab *s)
+select_source_symtab ()
 {
-  if (s)
-    {
-      current_source_location *loc
-	= get_source_location (s->compunit ()->objfile ()->pspace);
-      loc->set (s, 1);
-      return;
-    }
-
   current_source_location *loc = get_source_location (current_program_space);
   if (loc->symtab () != nullptr)
     return;
@@ -363,7 +355,7 @@ select_source_symtab (struct symtab *s)
 
   for (objfile *objfile : current_program_space->objfiles ())
     {
-      s = objfile->find_last_source_symtab ();
+      symtab *s = objfile->find_last_source_symtab ();
       if (s)
 	new_symtab = s;
     }
@@ -1617,7 +1609,7 @@ search_command_helper (const char *regex, int from_tty, bool forward)
   current_source_location *loc
     = get_source_location (current_program_space);
   if (loc->symtab () == nullptr)
-    select_source_symtab (0);
+    select_source_symtab ();
 
   if (!source_open)
     error (_("source code access disabled"));
diff --git a/gdb/source.h b/gdb/source.h
index d3e612ceaa1..8fbc365680d 100644
--- a/gdb/source.h
+++ b/gdb/source.h
@@ -202,13 +202,11 @@ extern void print_source_lines (struct symtab *s, source_lines_range r,
    may be found in a different directory now.  */
 extern void forget_cached_source_info (void);
 
-/* Set the source file default for the "list" command to be S.
-
-   If S is NULL, and we don't have a default, find one.  This
-   should only be called when the user actually tries to use the
-   default, since we produce an error if we can't find a reasonable
-   default.  Also, since this can cause symbols to be read, doing it
-   before we need to would make things slower than necessary.  */
-extern void select_source_symtab (struct symtab *s);
+/* Find a source file default for the "list" command.  This should
+   only be called when the user actually tries to use the default,
+   since we produce an error if we can't find a reasonable default.
+   Also, since this can cause symbols to be read, doing it before we
+   need to would make things slower than necessary.  */
+extern void select_source_symtab ();
 
 #endif
-- 
2.39.2

Re: [PATCH] Remove parameter from select_source_symtab

[Bruno Larsen]

On 17/04/2023 23:24, Tom Tromey wrote:
> I noticed that select_source_symtab is only ever called with nullptr
> as an argument, so this patch removes the parameter and associated
> logic.
> ---

Hi Tom,

Looks alright to me!

Reviewed-By: Bruno Larsen <blarsen@redhat.com>

-- 
Cheers,
Bruno

Re: [PATCH] Remove parameter from select_source_symtab

[Tom Tromey]

>>>>> Bruno Larsen via Gdb-patches <gdb-patches@sourceware.org> writes:

> On 17/04/2023 23:24, Tom Tromey wrote:
>> I noticed that select_source_symtab is only ever called with nullptr
>> as an argument, so this patch removes the parameter and associated
>> logic.
>> ---

> Looks alright to me!

> Reviewed-By: Bruno Larsen <blarsen@redhat.com>

Thanks, I'm checking it in.

Tom