From 801109578cd2a6ebd690dd23f0d4a1f4a67aee09 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 28 Jun 2019 23:35:31 -0600 Subject: [PATCH] Remove some dead code from tui_set_layout tui_set_layout sets regs_populate using: regs_populate = (new_layout == SRC_DATA_COMMAND || new_layout == DISASSEM_DATA_COMMAND); Then later it checks this variable: if (!regs_populate && (new_layout == SRC_DATA_COMMAND || new_layout == DISASSEM_DATA_COMMAND)) However, this is equivalent to "!regs_populate && regs_populate", which can never be true. So, remove the dead code and the variable. gdb/ChangeLog 2019-07-17 Tom Tromey * tui/tui-layout.c (tui_set_layout): Remove regs_populate variable. --- gdb/ChangeLog | 5 +++++ gdb/tui/tui-layout.c | 17 ++++------------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 97d5e85f691..338c39a0431 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-07-17 Tom Tromey + + * tui/tui-layout.c (tui_set_layout): Remove regs_populate + variable. + 2019-07-17 Tom Tromey * tui/tui.c (tui_rl_other_window): Update. diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c index a02c157b87e..ac0d01c990a 100644 --- a/gdb/tui/tui-layout.c +++ b/gdb/tui/tui-layout.c @@ -127,9 +127,7 @@ tui_set_layout (enum tui_layout_type layout_type) if (layout_type != UNDEFINED_LAYOUT) { - enum tui_layout_type cur_layout = tui_current_layout (), - new_layout = UNDEFINED_LAYOUT; - int regs_populate = FALSE; + enum tui_layout_type cur_layout = tui_current_layout (); struct gdbarch *gdbarch; CORE_ADDR addr; struct tui_win_info *win_with_focus = tui_win_with_focus (); @@ -137,10 +135,8 @@ tui_set_layout (enum tui_layout_type layout_type) extract_display_start_addr (&gdbarch, &addr); - new_layout = layout_type; + enum tui_layout_type new_layout = layout_type; - regs_populate = (new_layout == SRC_DATA_COMMAND - || new_layout == DISASSEM_DATA_COMMAND); if (new_layout != cur_layout) { show_layout (new_layout); @@ -212,14 +208,9 @@ tui_set_layout (enum tui_layout_type layout_type) /* * Now update the window content. */ - if (!regs_populate - && (new_layout == SRC_DATA_COMMAND - || new_layout == DISASSEM_DATA_COMMAND)) - TUI_DATA_WIN->display_all_data (); - tui_update_source_windows_with_addr (gdbarch, addr); - - if (regs_populate) + if (new_layout == SRC_DATA_COMMAND + || new_layout == DISASSEM_DATA_COMMAND) tui_show_registers (TUI_DATA_WIN->current_group); } } -- 2.30.2