Patchwork [v2,5/8] Don't call decode_line_with_current_source from select_source_symtab

login
register
mail settings
Submitter Tom Tromey
Date Aug. 1, 2019, 5:04 p.m.
Message ID <20190801170412.5553-6-tromey@adacore.com>
Download mbox | patch
Permalink /patch/33902/
State New
Headers show

Comments

Tom Tromey - Aug. 1, 2019, 5:04 p.m.
select_source_symtab currently calls decode_line_with_current_source.
However, this function iterates over all program spaces, and so it is
possible that it will return a "main" from some other program space.

This patch changes select_source_symtab to simply use the symbol it
already found in the current program space.

gdb/ChangeLog
2019-08-01  Tom Tromey  <tromey@adacore.com>

	* source.c (select_source_symtab): Don't call
	decode_line_with_current_source.
---
 gdb/ChangeLog |  5 +++++
 gdb/source.c  | 11 ++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

Patch

diff --git a/gdb/source.c b/gdb/source.c
index a83e55e5699..1aef019da44 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -251,17 +251,14 @@  select_source_symtab (struct symtab *s)
 
   /* Make the default place to list be the function `main'
      if one exists.  */
-  if (lookup_symbol (main_name (), 0, VAR_DOMAIN, 0).symbol)
+  block_symbol bsym = lookup_symbol (main_name (), 0, VAR_DOMAIN, 0);
+  if (bsym.symbol != nullptr && SYMBOL_CLASS (bsym.symbol) == LOC_BLOCK)
     {
-      std::vector<symtab_and_line> sals
-	= decode_line_with_current_source (main_name (),
-					   DECODE_LINE_FUNFIRSTLINE);
-      const symtab_and_line &sal = sals[0];
+      symtab_and_line sal = find_function_start_sal (bsym.symbol, true);
       current_source_pspace = sal.pspace;
       current_source_symtab = sal.symtab;
       current_source_line = std::max (sal.line - (lines_to_list - 1), 1);
-      if (current_source_symtab)
-	return;
+      return;
     }
 
   /* Alright; find the last file in the symtab list (ignoring .h's