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

gdb: Remove redundant frame switching

Browse source 
547ce8f00b fixed an issue where dynamic types were not being resolved
correctly prior to printing a value. The same issue was discovered when
printing the value using mi-mode, which was not covered by the fix.
Porting the fix to the mi-mode code path resolved the issue.

However, it was discovered that a later patch series, ending
2fc3b8a4cb, independently fixed the issue in both the cli- and mi-mode
code paths, making the original fix unneeded.

This commit removes this extra frame switch and adds test coverage for
the mi-mode scenario to protect against any future divergence in this
area.

GDB built with GCC 11.

No test suite regressions detected. Compilers: GCC 12.1.0, ACfL 22.1,
Intel 22.1; Platforms: x86_64, aarch64.

Approved-By: Tom Tromey <tom@tromey.com>
This commit is contained in:
Richard Bunt 2023-05-19 08:17:20 +01:00
parent e84060b489
commit 712872748d
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/stack.c
View file

@ -742,12 +742,6 @@ print_frame_args (const frame_print_options &fp_opts,
= (print_names
&& fp_opts.print_frame_arguments != print_frame_arguments_none);
/* Temporarily change the selected frame to the given FRAME.
This allows routines that rely on the selected frame instead
of being given a frame as parameter to use the correct frame. */
scoped_restore_selected_frame restore_selected_frame;
select_frame (frame);
if (func)
{
const struct block *b = func->value_block ();

12
gdb/testsuite/gdb.fortran/mixed-lang-stack.exp
View file

@ -92,6 +92,18 @@ proc run_tests { lang } {
}
}
# Check backtrace arguments in MI mode.
set mi_a "\{name=\"a\",value=\"1\"\}"
set mi_b "\{name=\"b\",value=\"2\"\}"
set mi_c "\{name=\"c\",value=\"3\"\}"
set mi_d "\{name=\"d\",value=\"\\(4,5\\)\"\}"
set mi_e "\{name=\"e\",value=\"$e_arg\"\}"
set mi_g "\{name=\"g\",value=\"\\( a = 1.5, b = 2.5 \\)\"\}"
# Hidden argument name changes depending on compiler.
set mi_hidden "\{name=\"\[^\r\n\]+\",value=\"6\"\}"
gdb_test "interpreter-exec mi '-stack-list-arguments --no-frame-filters --all-values 7 7'" \
"\\^done,stack-args=\\\[frame=\{level=\"7\",args=\\\[$mi_a,$mi_b,$mi_c,$mi_d,$mi_e,$mi_g,$mi_hidden\\\]\}\\\]"
# Check the language for frame #0.
gdb_test "info frame" "source language fortran\..*" \
"info frame in frame #0"