diff options
| author | Tom Tromey <tromey@adacore.com> | 2019-08-01 09:17:14 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2019-10-02 09:53:17 -0600 |
| commit | 5c281dbb2458be9d58355e865f527e96b40bcd8c (patch) | |
| tree | abffdd8f111e441f5bb01c67edae916c56de2135 | |
| parent | d3d323915c034ed9f7465568e1876aa269ab1d0f (diff) | |
| download | gdb-5c281dbb2458be9d58355e865f527e96b40bcd8c.zip gdb-5c281dbb2458be9d58355e865f527e96b40bcd8c.tar.gz gdb-5c281dbb2458be9d58355e865f527e96b40bcd8c.tar.bz2 | |
Don't call decode_line_with_current_source from select_source_symtab
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.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/source.c | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c2417cf..d419fdf 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -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> * symtab.c (lookup_global_symbol): Search global block. diff --git a/gdb/source.c b/gdb/source.c index ff21818..9222df1 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -252,17 +252,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 |