diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-01-18 00:46:13 -0500 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2021-01-18 00:46:13 -0500 |
| commit | b5c8f22d280c74ead1351e0f6e56a529f3b866b5 (patch) | |
| tree | f51d2b26f13e14c0370000136c27e4cc2e3cadb3 | |
| parent | e3b2741b162209a497db03ed4d19890326f16816 (diff) | |
| download | gdb-b5c8f22d280c74ead1351e0f6e56a529f3b866b5.zip gdb-b5c8f22d280c74ead1351e0f6e56a529f3b866b5.tar.gz gdb-b5c8f22d280c74ead1351e0f6e56a529f3b866b5.tar.bz2 | |
gdb: move remote_target::start_remote variable to narrower scope
The wait_status variable is only used when the target is in in all-stop
mode. We can therefore move it in the !target_is_non_stop scope. That
lets us remove the assert in the else, that checks that the wait status
is not set. If the variable doesn't exist in that scope, it pretty much
guarantees that it is not set.
gdb/ChangeLog:
* remote.c (remote_target::start_remote): Move wait_status to
narrower scope.
Change-Id: I30979135e3f4f36d04178baa67575c4e58d3b648
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/remote.c | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 657e707..a7c8b77 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2021-01-18 Simon Marchi <simon.marchi@polymtl.ca> + * remote.c (remote_target::start_remote): Move wait_status to + narrower scope. + +2021-01-18 Simon Marchi <simon.marchi@polymtl.ca> + * remote.c (class remote_target): <add_current_inferior_and_thread>: Constify parameter. (stop_reply_extract_thread): Likewise. diff --git a/gdb/remote.c b/gdb/remote.c index 49181d3..17b0cab 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -4636,7 +4636,6 @@ remote_target::start_remote (int from_tty, int extended_p) { struct remote_state *rs = get_remote_state (); struct packet_config *noack_config; - char *wait_status = NULL; /* Signal other parts that we're going through the initial setup, and so things may not be stable yet. E.g., we don't try to @@ -4776,6 +4775,8 @@ remote_target::start_remote (int from_tty, int extended_p) if (!target_is_non_stop_p ()) { + char *wait_status = NULL; + if (rs->buf[0] == 'W' || rs->buf[0] == 'X') { if (!extended_p) @@ -4903,10 +4904,6 @@ remote_target::start_remote (int from_tty, int extended_p) return; } - /* In non-stop mode, any cached wait status will be stored in - the stop reply queue. */ - gdb_assert (wait_status == NULL); - /* Report all signals during attach/startup. */ pass_signals ({}); |