gdb: pass program space to clear_current_source_symtab_and_line

Make the current program space reference bubble up one level.

Change-Id: I692554474d17e4f4708fd8ad662bf6c0bb964726
Approved-By: Tom Tromey <tom@tromey.com>
Reviewed-By: Thiago Jung Bauermann <thiago.bauermann@linaro.org>

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 3af794cebaf2b7e781662180078b26d9dd94d535..450009156d4bbc67fb9bb83c8c9a0df980c36b3e 100644 (file)
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -1295,7 +1295,7 @@ list_command (const char *arg, int from_tty)
            {
              /* The inferior is not running, so reset the current source
                 location to the default (usually the main function).  */
-             clear_current_source_symtab_and_line ();
+             clear_current_source_symtab_and_line (current_program_space);
              try
                {
                  set_default_source_symtab_and_line ();

diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 56add01daa65f7067ca68d887b5fc7b210b8f6eb..f51baab8d2ccedfdc1a34cc03e10c387551f1f77 100644 (file)
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -564,7 +564,7 @@ objfile::~objfile ()
     struct symtab_and_line cursal = get_current_source_symtab_and_line ();
 
     if (cursal.symtab && cursal.symtab->compunit ()->objfile () == this)
-      clear_current_source_symtab_and_line ();
+      clear_current_source_symtab_and_line (this->pspace ());
   }
 
   /* Rebuild section map next time we need it.  */

diff --git a/gdb/source.c b/gdb/source.c
index 9e528d3f705dc875327a8b4860ee0b2f5a4fb0d3..bced213171a6ca5ae43e68942e8be6f8a947b2e9 100644 (file)
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -298,9 +298,9 @@ set_current_source_symtab_and_line (const symtab_and_line &sal)
 /* Reset any information stored about a default file and line to print.  */
 
 void
-clear_current_source_symtab_and_line (void)
+clear_current_source_symtab_and_line (program_space *pspace)
 {
-  current_source_location *loc = get_source_location (current_program_space);
+  current_source_location *loc = get_source_location (pspace);
   loc->set (nullptr, 0);
 }
 

diff --git a/gdb/source.h b/gdb/source.h
index 144ee48f72237ca72db9c8cdaa5d2177a42a2392..4eb1793789931213df8dd4521c8c7a2969dc955c 100644 (file)
--- a/gdb/source.h
+++ b/gdb/source.h
@@ -21,6 +21,7 @@
 
 #include "gdbsupport/scoped_fd.h"
 
+struct program_space;
 struct symtab;
 
 /* See openp function definition for their description.  */
@@ -126,7 +127,7 @@ extern symtab_and_line set_current_source_symtab_and_line
   (const symtab_and_line &sal);
 
 /* Reset any information stored about a default file and line to print.  */
-extern void clear_current_source_symtab_and_line (void);
+extern void clear_current_source_symtab_and_line (program_space *pspace);
 
 /* Add a source path substitution rule.  */
 extern void add_substitute_path_rule (const char *, const char *);

diff --git a/gdb/symfile.c b/gdb/symfile.c
index 6b722214663b1fadc185e2b8843befc55b878d28..69230482da3cde23cc6d057414fa85b5df8664a9 100644 (file)
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -2884,7 +2884,7 @@ clear_symtab_users (symfile_add_flags add_flags)
 
   /* Clear the "current" symtab first, because it is no longer valid.
      breakpoint_re_set may try to access the current symtab.  */
-  clear_current_source_symtab_and_line ();
+  clear_current_source_symtab_and_line (current_program_space);
 
   clear_displays ();
   clear_last_displayed_sal ();