[binutils-gdb] Remove an unneeded NULL check

[binutils-gdb] Remove an unneeded NULL check

[gdb-buildbot]

*** TEST RESULTS FOR COMMIT 6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47 ***

commit 6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47
Author:     Tom Tromey <tom@tromey.com>
AuthorDate: Sun Jun 16 14:14:10 2019 -0600
Commit:     Tom Tromey <tom@tromey.com>
CommitDate: Tue Jun 25 07:48:32 2019 -0600

    Remove an unneeded NULL check
    
    show_source_or_disasm_and_command will either create or reset the
    source window, so the final NULL check is not necessary.  This patch
    removes it.
    
    gdb/ChangeLog
    2019-06-25  Tom Tromey  <tom@tromey.com>
    
            * tui/tui-layout.c (show_source_or_disasm_and_command): Remove
            NULL check.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b529085e23..0e2c74e4e2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2019-06-25  Tom Tromey  <tom@tromey.com>
 
+	* tui/tui-layout.c (show_source_or_disasm_and_command): Remove
+	NULL check.
+
+2019-06-25  Tom Tromey  <tom@tromey.com>
+
 	* tui/tui-data.h (struct tui_data_window, struct tui_cmd_window):
 	Inline constructor.  Add initializers for members.
 	* tui/tui-data.c (tui_data_window, tui_cmd_window): Remove
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 72ec924f72..de78c6c0ac 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -945,30 +945,28 @@ show_source_or_disasm_and_command (enum tui_layout_type layout_type)
 	  tui_make_visible (&(*win_info_ptr)->generic);
 	  tui_make_visible (base->execution_info);
 	}
-      if ((*win_info_ptr) != NULL)
-	{
-	  base->m_has_locator = true;
-	  tui_make_visible (locator);
-	  tui_show_locator_content ();
-	  tui_show_source_content (*win_info_ptr);
 
-	  if (TUI_CMD_WIN == NULL)
-	    {
-	      tui_win_list[CMD_WIN] = make_command_window (cmd_height,
-							   src_height);
-	      tui_refresh_win (&TUI_CMD_WIN->generic);
-	    }
-	  else
-	    {
-	      init_gen_win_info (&TUI_CMD_WIN->generic,
-				 TUI_CMD_WIN->generic.type,
-				 TUI_CMD_WIN->generic.height,
-				 TUI_CMD_WIN->generic.width,
-				 TUI_CMD_WIN->generic.origin.x,
-				 TUI_CMD_WIN->generic.origin.y);
-	      TUI_CMD_WIN->can_highlight = FALSE;
-	      tui_make_visible (&TUI_CMD_WIN->generic);
-	    }
+      base->m_has_locator = true;
+      tui_make_visible (locator);
+      tui_show_locator_content ();
+      tui_show_source_content (*win_info_ptr);
+
+      if (TUI_CMD_WIN == NULL)
+	{
+	  tui_win_list[CMD_WIN] = make_command_window (cmd_height,
+						       src_height);
+	  tui_refresh_win (&TUI_CMD_WIN->generic);
+	}
+      else
+	{
+	  init_gen_win_info (&TUI_CMD_WIN->generic,
+			     TUI_CMD_WIN->generic.type,
+			     TUI_CMD_WIN->generic.height,
+			     TUI_CMD_WIN->generic.width,
+			     TUI_CMD_WIN->generic.origin.x,
+			     TUI_CMD_WIN->generic.origin.y);
+	  TUI_CMD_WIN->can_highlight = FALSE;
+	  tui_make_visible (&TUI_CMD_WIN->generic);
 	}
       tui_set_current_layout_to (layout_type);
     }

Failures on Fedora-i686, branch master

[gdb-buildbot]

Buildername:
        Fedora-i686

Worker:
        fedora-x86-64-4

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/18/builds/39

Author:
        Tom Tromey <tom@tromey.com>

Commit tested:
        6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47

Subject of commit:
        Remove an unneeded NULL check

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-i686/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47

*** Diff to previous build ***
==============================================
new FAIL: gdb.base/catch-syscall.exp: multiple targets: insert catch syscall on syscall 1 -- write on i386:x86-64
new FAIL: gdb.python/py-finish-breakpoint2.exp: check FinishBreakpoint in catch
new FAIL: gdb.python/py-finish-breakpoint2.exp: check finish BP removal
new FAIL: gdb.python/py-finish-breakpoint2.exp: continue to second exception
new FAIL: gdb.python/py-finish-breakpoint2.exp: set FinishBP after the exception
new FAIL: gdb.python/py-format-string.exp: format_string: lang_cpp: a_base_ref with option deref_refs: deref_refs=true
new FAIL: gdb.python/py-format-string.exp: format_string: lang_cpp: a_base_ref with option deref_refs=True, static_members=False
new KFAIL: gdb.xml/tdesc-arch.exp: set tdesc filename tdesc-arch.xml
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-i686/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47/xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-i686/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47/xfail.table.gz>

Failures on Fedora-x86_64-cc-with-index, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-cc-with-index

Worker:
        fedora-x86-64-3

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/20/builds/39

Author:
        Tom Tromey <tom@tromey.com>

Commit tested:
        6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47

Subject of commit:
        Remove an unneeded NULL check

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-cc-with-index/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47

*** Diff to previous build ***
==============================================
PASS -> KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=off: cond_bp_target=0: inferior 1 exited
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-cc-with-index/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47/xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-cc-with-index/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47/xfail.table.gz>

Failures on Fedora-x86_64-m32, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-m32

Worker:
        fedora-x86-64-2

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/17/builds/39

Author:
        Tom Tromey <tom@tromey.com>

Commit tested:
        6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47

Subject of commit:
        Remove an unneeded NULL check

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-m32/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47

*** Diff to previous build ***
==============================================
new FAIL: gdb.base/corefile.exp: core-file warning-free
PASS -> KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=off: cond_bp_target=0: inferior 1 exited
PASS -> KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=on: cond_bp_target=1: inferior 1 exited
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-m32/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47/xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-m32/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47/xfail.table.gz>

Failures on Fedora-x86_64-native-extended-gdbserver-m32, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-native-extended-gdbserver-m32

Worker:
        fedora-x86-64-4

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/4/builds/39

Author:
        Tom Tromey <tom@tromey.com>

Commit tested:
        6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47

Subject of commit:
        Remove an unneeded NULL check

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m32/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47

*** Diff to previous build ***
==============================================
UNRESOLVED -> FAIL: gdb.mi/mi-exec-run.exp: inferior-tty=main: mi=main: force-fail=1: run failure detected
UNRESOLVED -> FAIL: gdb.mi/mi-exec-run.exp: inferior-tty=main: mi=separate: force-fail=1: run failure detected
UNRESOLVED -> FAIL: gdb.mi/mi-exec-run.exp: inferior-tty=separate: mi=main: force-fail=1: run failure detected
UNRESOLVED -> FAIL: gdb.mi/mi-exec-run.exp: inferior-tty=separate: mi=separate: force-fail=1: run failure detected
PASS -> KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=off: cond_bp_target=1: inferior 1 exited
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m32/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47/xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-extended-gdbserver-m32/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47/xfail.table.gz>

Failures on Fedora-x86_64-native-gdbserver-m32, branch master

[gdb-buildbot]

Buildername:
        Fedora-x86_64-native-gdbserver-m32

Worker:
        fedora-x86-64-2

Full Build URL:
	https://gdb-buildbot.osci.io/#builders/24/builds/39

Author:
        Tom Tromey <tom@tromey.com>

Commit tested:
        6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47

Subject of commit:
        Remove an unneeded NULL check

Testsuite logs (gdb.sum, gdb.log and others):
        https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m32/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47

*** Diff to previous build ***
==============================================
new FAIL: gdb.base/corefile.exp: core-file warning-free
==============================================

*** Complete list of XFAILs for this builder ***

To obtain the list of XFAIL tests for this builder, go to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m32/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47/xfail.gz>

You can also see a pretty-printed version of the list, with more information
about each XFAIL, by going to:

        <https://gdb-buildbot.osci.io/results/Fedora-x86_64-native-gdbserver-m32/6a/6a0ee02c22b78b6d49fda99b6f2f9154d0cb0a47/xfail.table.gz>