From cfd85eb3ef8d1c823daaa00783c4244089587a3a Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Fri, 22 Oct 2021 00:28:14 +0200 Subject: [PATCH] [gdb/tui] Fix breakpoint display functionality In commit 81e6b8eb208 "Make tui-winsource not use breakpoint_chain", a loop body was transformed into a lambda function body: ... - for (bp = breakpoint_chain; - bp != NULL; - bp = bp->next) + iterate_over_breakpoints ([&] (breakpoint *bp) -> bool ... and consequently: - a continue was replaced by a return, and - a final return was added. Then in commit 240edef62f0 "gdb: remove iterate_over_breakpoints function", we transformed back to a loop body: ... - iterate_over_breakpoints ([&] (breakpoint *bp) -> bool + for (breakpoint *bp : all_breakpoints ()) ... but without reverting the changes that introduced the two returns. Consequently, breakpoints no longer show up in the tui source window. Fix this by reverting the changes that introduced the two returns. Build on x86_64-linux, tested with all .exp test-cases that contain tuiterm_env. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28483 gdb/ChangeLog: 2021-10-22 Tom de Vries PR tui/28483 * tui/tui-winsource.c (tui_source_window_base::update_breakpoint_info): Fix returns in loop body. gdb/testsuite/ChangeLog: 2021-10-22 Tom de Vries PR tui/28483 * gdb.tui/break.exp: New file. --- gdb/ChangeLog | 6 ++++++ gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.tui/break.exp | 37 +++++++++++++++++++++++++++++++++ gdb/tui/tui-winsource.c | 3 +-- 4 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 gdb/testsuite/gdb.tui/break.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 21c305cddf..7911e7688f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2021-10-22 Tom de Vries + + PR tui/28483 + * tui/tui-winsource.c (tui_source_window_base::update_breakpoint_info): + Fix returns in loop body. + 2021-10-04 Tom de Vries PR build/28318 diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2a65fd0236..54cfd221ab 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2021-10-22 Tom de Vries + + PR tui/28483 + * gdb.tui/break.exp: New file. + 2021-09-13 Joel Brobecker * gdb.base/default.exp: Change $_gdb_minor to 2. diff --git a/gdb/testsuite/gdb.tui/break.exp b/gdb/testsuite/gdb.tui/break.exp new file mode 100644 index 0000000000..de4821c570 --- /dev/null +++ b/gdb/testsuite/gdb.tui/break.exp @@ -0,0 +1,37 @@ +# Copyright 2021 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Verify that breakpoint marker is shown. + +tuiterm_env + +standard_testfile tui-layout.c + +if {[build_executable "failed to prepare" ${testfile} ${srcfile}] == -1} { + return -1 +} + +Term::clean_restart 24 80 $testfile +if {![Term::enter_tui]} { + unsupported "TUI not supported" + return +} + +set text [Term::get_all_lines] +gdb_assert {![string match "No Source Available" $text]} \ + "initial source listing" + +Term::command "b main" +Term::check_contents "break marker present" "\\|b\\+" diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index afd51e9598..955b68901f 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -460,7 +460,7 @@ tui_source_window_base::update_breakpoint_info for (breakpoint *bp : all_breakpoints ()) { if (bp == being_deleted) - return false; + continue; for (bp_location *loc : bp->locations ()) { @@ -478,7 +478,6 @@ tui_source_window_base::update_breakpoint_info mode |= TUI_BP_HARDWARE; } } - return false; } if (line->break_mode != mode) -- 2.34.1