Simplify tui_show_disassem

tui_show_disassem does not need to call tui_add_win_to_layout, because
the callers that could change the layout have already ensured that it
exists.

gdb/ChangeLog
2019-08-13  Tom Tromey  <tom@tromey.com>

	* tui/tui-disasm.c (tui_show_disassem): Add assertion.  Don't call
	tui_add_win_to_layout.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8e70be6ebdd9962a7616a1e81aca39d540782d0b..50128426f0c31a79bb31405f376ff8e96d508007 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-13  Tom Tromey  <tom@tromey.com>
+
+       * tui/tui-disasm.c (tui_show_disassem): Add assertion.  Don't call
+       tui_add_win_to_layout.
+
 2019-08-13  Tom Tromey  <tom@tromey.com>
 
        * tui/tui-layout.h (tui_default_win_height): Don't declare.

diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 80f8d47f0acd23a01ed8855fcc78812b742b155c..a442a00019e142583ab405ded51e6b88f6310bbe 100644 (file)
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -255,9 +255,10 @@ tui_show_disassem (struct gdbarch *gdbarch, CORE_ADDR start_addr)
   struct tui_win_info *win_with_focus = tui_win_with_focus ();
   struct tui_line_or_address val;
 
+  gdb_assert (TUI_DISASM_WIN != nullptr && TUI_DISASM_WIN->is_visible);
+
   val.loa = LOA_ADDRESS;
   val.u.addr = start_addr;
-  tui_add_win_to_layout (DISASSEM_WIN);
   tui_update_source_window (TUI_DISASM_WIN, gdbarch, s, val, FALSE);
 
   /* If the focus was in the src win, put it in the asm win, if the