FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't call decode_line_with_current_source from select_source_symtab

Browse source 
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-10-02  Tom Tromey  <tromey@adacore.com>

	* source.c (select_source_symtab): Don't call
	decode_line_with_current_source.
This commit is contained in:
Tom Tromey 2019-08-01 09:17:14 -06:00
parent d3d323915c
commit 5c281dbb24
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2019-10-02 Tom Tromey <tromey@adacore.com>
* source.c (select_source_symtab): Don't call
decode_line_with_current_source.
2019-10-02 Andrew Burgess <andrew.burgess@embecosm.com> 2019-10-02 Andrew Burgess <andrew.burgess@embecosm.com>
* symtab.c (lookup_global_symbol): Search global block. * symtab.c (lookup_global_symbol): Search global block.

11
gdb/source.c
View file

@ -252,17 +252,14 @@ select_source_symtab (struct symtab *s)
/* Make the default place to list be the function `main' /* Make the default place to list be the function `main'
if one exists. */ 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 symtab_and_line sal = find_function_start_sal (bsym.symbol, true);
= decode_line_with_current_source (main_name (),
DECODE_LINE_FUNFIRSTLINE);
const symtab_and_line &sal = sals[0];
current_source_pspace = sal.pspace; current_source_pspace = sal.pspace;
current_source_symtab = sal.symtab; current_source_symtab = sal.symtab;
current_source_line = std::max (sal.line - (lines_to_list - 1), 1); 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 /* Alright; find the last file in the symtab list (ignoring .h's