Re: [PATCH 3/3] Move decode_location to code_breakpoint

[Pedro Alves <pedro@palves.net>]

On 2022-05-28 03:42, Tom Tromey wrote:

> diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
> index 5ce6edf6efc..663c939c162 100644
> --- a/gdb/breakpoint.h
> +++ b/gdb/breakpoint.h
> @@ -709,16 +709,6 @@ struct breakpoint
>    /* Print to FP the CLI command that recreates this breakpoint.  */
>    virtual void print_recreate (struct ui_file *fp) const;
>  
> -  /* Given the location (second parameter), this method decodes it and
> -     returns the SAL locations related to it.  For ordinary
> -     breakpoints, it calls `decode_line_full'.  If SEARCH_PSPACE is
> -     not NULL, symbol search is restricted to just that program space.
> -
> -     This function is called inside `location_to_sals'.  */
> -  virtual std::vector<symtab_and_line> decode_location
> -    (struct event_location *location,
> -     struct program_space *search_pspace);
> -
>    /* Return true if this breakpoint explains a signal.  See
>       bpstat_explains_signal.  */
>    virtual bool explains_signal (enum gdb_signal)
> @@ -882,12 +872,19 @@ struct code_breakpoint : public breakpoint
>  		      const address_space *aspace,
>  		      CORE_ADDR bp_addr,
>  		      const target_waitstatus &ws) override;
> -  std::vector<symtab_and_line> decode_location
> -       (struct event_location *location,
> -	struct program_space *search_pspace) override;
>  
>  protected:
>  
> +  /* Given the location (second parameter), this method decodes it and

I've noticed that "second" here got stale when this was first
converted to a method.  I think we should just remove the parenthetical
remark and be done with it.  Would you mind doing that while at it?

The patch looks OK, regardless.

Pedro Alves

> +     returns the SAL locations related to it.  For ordinary
> +     breakpoints, it calls `decode_line_full'.  If SEARCH_PSPACE is
> +     not NULL, symbol search is restricted to just that program space.
> +
> +     This function is called inside `location_to_sals'.  */
> +  virtual std::vector<symtab_and_line> decode_location
> +    (struct event_location *location,
> +     struct program_space *search_pspace);
> +
>    /* Helper method that does the basic work of re_set.  */
>    void re_set_default ();
>