Hoist assertion in target_stack::unpush

I noticed that target_stack::unpush first uses the target "t", then
later asserts that it is non-NULL:

  strata stratum = t->stratum ();
[...]
  gdb_assert (t != NULL);

This is backwards, though, as the assertion must come first.

gdb/ChangeLog
2019-02-05  Tom Tromey  <tom@tromey.com>

	* target.c (target_stack::unpush): Move assertion earlier.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b06398ab33fdfd982680f71399a9adfb31e9905b..0ce33f237e84b06c8e8917a752861d4758cd07f4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2019-02-05  Tom Tromey  <tom@tromey.com>
+
+       * target.c (target_stack::unpush): Move assertion earlier.
+
 2019-01-30  Tom Tromey  <tom@tromey.com>
 
        PR python/23615:

diff --git a/gdb/target.c b/gdb/target.c
index c5502ce1791d0c0798031d01e097222b3668f0fa..c1ab07f76086ef71b6f55d403fd5d3eee5fe5eab 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -598,14 +598,14 @@ unpush_target (struct target_ops *t)
 bool
 target_stack::unpush (target_ops *t)
 {
+  gdb_assert (t != NULL);
+
   strata stratum = t->stratum ();
 
   if (stratum == dummy_stratum)
     internal_error (__FILE__, __LINE__,
                    _("Attempt to unpush the dummy target"));
 
-  gdb_assert (t != NULL);
-
   /* Look for the specified target.  Note that a target can only occur
      once in the target stack.  */