aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2019-02-05 04:59:11 -0700
committerTom Tromey <tom@tromey.com>2019-02-05 06:36:48 -0700
commit1688cb2916e7bc46c92dd6f5ac2ba0da6c832274 (patch)
treea676543712ea10d6861a9e1d1fcbbc6949ed4532
parent4dcfcfe0638d8e946b05fe51714c7d5b85b693c1 (diff)
downloadgdb-1688cb2916e7bc46c92dd6f5ac2ba0da6c832274.zip
gdb-1688cb2916e7bc46c92dd6f5ac2ba0da6c832274.tar.gz
gdb-1688cb2916e7bc46c92dd6f5ac2ba0da6c832274.tar.bz2
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.
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/target.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b06398a..0ce33f2 100644
--- 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 c5502ce..c1ab07f 100644
--- 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. */