espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-08-03 04:01:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Fortran regression with variables in nested functions

Browse Source 
Sergio pointed out that commit commit aa3b6533 ("Allow nested function
displays") regressed a few gdb.fortran tests.  I was able to reproduce
these failures with gcc head.

The bug is that some spots calling contained_in will in fact do the
wrong thing if nested functions are considered as contained.  In the
particular case of the Fortran regression, it was the call in
block_innermost_frame, being called from get_hosting_frame -- in this
case, the caller is specifically trying to avoid the nested case.

This patch fixes the problem by adding an "allow_nested" parameter to
contained_in, essentially reverting the change for most callers.

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

	* printcmd.c (do_one_display, info_display_command): Update.
	* block.h (contained_in): Return bool.  Add allow_nested
	parameter.
	* block.c (contained_in): Return bool.  Add allow_nested
	parameter.
This commit is contained in:
Tom Tromey
2019-08-13 11:39:58 -06:00
parent d806ea2d0e
commit f21c2bd7b7
4 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/printcmd.c
View File

@ -1936,7 +1936,8 @@ do_one_display (struct display *d)
if (d->block)
{
if (d->pspace == current_program_space)
within_current_scope = contained_in (get_selected_block (0), d->block);
within_current_scope = contained_in (get_selected_block (0), d->block,
true);
else
within_current_scope = 0;
}
@ -2098,7 +2099,7 @@ Num Enb Expression\n"));
else if (d->format.format)
printf_filtered ("/%c ", d->format.format);
puts_filtered (d->exp_string);
if (d->block && !contained_in (get_selected_block (0), d->block))
if (d->block && !contained_in (get_selected_block (0), d->block, true))
printf_filtered (_(" (cannot be evaluated in the current context)"));
printf_filtered ("\n");
}