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
This commit is contained in:
Simon Marchi 2021-01-18 00:46:13 -05:00
parent e3b2741b16
commit b5c8f22d28
2 changed files with 7 additions and 5 deletions

View File

@ -1,3 +1,8 @@
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):

View File

@ -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 ({});