public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Andrew Burgess <aburgess@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] gdb/tui: convert if/error to an assert
Date: Wed, 25 Jan 2023 11:27:27 +0000 (GMT)	[thread overview]
Message-ID: <20230125112727.38EE73857835@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6789344ab22f7fbce94a31297b994f85685b90c6

commit 6789344ab22f7fbce94a31297b994f85685b90c6
Author: Andrew Burgess <aburgess@redhat.com>
Date:   Thu Dec 22 12:43:38 2022 +0000

    gdb/tui: convert if/error to an assert
    
    While working on the previous commit, I realised that there was an
    error in tui_set_focus_command that could never be triggered.
    
    Since the big tui rewrite (adding dynamic layouts) it is no longer
    true that there is a tui_win_info object for every window at all
    times.  We now only create a tui_win_info object for a particular
    window, when the window is part of the current layout.  As a result,
    if we have a tui_win_info pointer, then the window must be visible
    inside tui_set_focus_command (this function calls tui_enable as its
    first action, which makes the current layout visible).
    
    The gdb.tui/tui-focus.exp test script exercises this area of code, and
    doesn't trigger the assert, nor do any of our other existing tui
    tests.

Diff:
---
 gdb/tui/tui-win.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 9c088899817..4fc8e7a4503 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -720,8 +720,11 @@ tui_set_focus_command (const char *arg, int from_tty)
 
   if (win_info == NULL)
     error (_("Unrecognized window name \"%s\""), arg);
-  if (!win_info->is_visible ())
-    error (_("Window \"%s\" is not visible"), arg);
+
+  /* If a window is part of the current layout then it will have a
+     tui_win_info associated with it and be visible, otherwise, there will
+     be no tui_win_info and the above error will have been raised.  */
+  gdb_assert (win_info->is_visible ());
 
   if (!win_info->can_focus ())
     error (_("Window \"%s\" cannot be focused"), arg);

                 reply	other threads:[~2023-01-25 11:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230125112727.38EE73857835@sourceware.org \
    --to=aburgess@sourceware.org \
    --cc=gdb-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).