Re: [PATCH 01/12] gdb: int to bool conversion for normal_stop

[Lancelot SIX <lsix@lancelotsix.com>]

Hi Andrew,

I believe there is one more callsite which can be updated in
infrun.c:fetch_inferior_event:

    diff --git a/gdb/infrun.c b/gdb/infrun.c
    index 3660272ef11..666c1c17f15 100644
    --- a/gdb/infrun.c
    +++ b/gdb/infrun.c
    @@ -4248,7 +4248,7 @@ fetch_inferior_event ()
            else
              {
                bool should_notify_stop = true;
    -           int proceeded = 0;
    +           bool proceeded = false;
    
                stop_all_threads_if_all_stop_mode ();

Otherwise, this looks good to me.

Best,
Lancelot.


On Fri, Oct 21, 2022 at 09:43:37AM +0100, Andrew Burgess via Gdb-patches wrote:
> Change the return type of normal_stop (infrun.c) from int to bool.
> Update callers.
> 
> There should be no user visible changes after this commit.
> ---
>  gdb/infcmd.c | 2 +-
>  gdb/infrun.c | 6 +++---
>  gdb/infrun.h | 2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/gdb/infcmd.c b/gdb/infcmd.c
> index d729732c81c..6af11ac0cb6 100644
> --- a/gdb/infcmd.c
> +++ b/gdb/infcmd.c
> @@ -873,7 +873,7 @@ step_1 (int skip_subroutines, int single_inst, const char *count_string)
>      proceed ((CORE_ADDR) -1, GDB_SIGNAL_DEFAULT);
>    else
>      {
> -      int proceeded;
> +      bool proceeded;
>  
>        /* Stepped into an inline frame.  Pretend that we've
>  	 stopped.  */
> diff --git a/gdb/infrun.c b/gdb/infrun.c
> index cdfe02393f5..39840ef32c8 100644
> --- a/gdb/infrun.c
> +++ b/gdb/infrun.c
> @@ -8614,7 +8614,7 @@ stop_context::changed () const
>  
>  /* See infrun.h.  */
>  
> -int
> +bool
>  normal_stop (void)
>  {
>    struct target_waitstatus last;
> @@ -8774,7 +8774,7 @@ normal_stop (void)
>       the observers would print a stop for the wrong
>       thread/inferior.  */
>    if (saved_context.changed ())
> -    return 1;
> +    return true;
>  
>    /* Notify observers about the stop.  This is where the interpreters
>       print the stop event.  */
> @@ -8796,7 +8796,7 @@ normal_stop (void)
>  	breakpoint_auto_delete (inferior_thread ()->control.stop_bpstat);
>      }
>  
> -  return 0;
> +  return false;
>  }
>  \f
>  int
> diff --git a/gdb/infrun.h b/gdb/infrun.h
> index c711b9b21cc..11a18583e68 100644
> --- a/gdb/infrun.h
> +++ b/gdb/infrun.h
> @@ -149,7 +149,7 @@ extern process_stratum_target *user_visible_resume_target (ptid_t resume_ptid);
>     appropriate messages, remove breakpoints, give terminal our modes,
>     and run the stop hook.  Returns true if the stop hook proceeded the
>     target, false otherwise.  */
> -extern int normal_stop (void);
> +extern bool normal_stop (void);
>  
>  /* Return the cached copy of the last target/ptid/waitstatus returned
>     by target_wait().  The data is actually cached by handle_inferior_event(),
> -- 
> 2.25.4
>