From: Simon Marchi <simark@simark.ca>
To: Tom Tromey <tom@tromey.com>, gdb-patches@sourceware.org
Subject: Re: [PATCH] Remove decode_location_spec_default
Date: Thu, 29 Sep 2022 19:59:16 -0400 [thread overview]
Message-ID: <2e9a3dab-8783-91b2-9ddf-64e72a5ad560@simark.ca> (raw)
In-Reply-To: <20220929233526.1283953-1-tom@tromey.com>
On 2022-09-29 19:35, Tom Tromey wrote:
> This removes decode_location_spec_default, inlining it into its sole
> caller.
>
> Regression tested on x86-64 Fedora 34.
> ---
> gdb/breakpoint.c | 45 +++++++++++++++------------------------------
> 1 file changed, 15 insertions(+), 30 deletions(-)
>
> diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
> index 002f4a935b1..c8c34120aa0 100644
> --- a/gdb/breakpoint.c
> +++ b/gdb/breakpoint.c
> @@ -100,10 +100,6 @@ static void create_breakpoints_sal (struct gdbarch *,
> int,
> int, int, int, unsigned);
>
> -static std::vector<symtab_and_line> decode_location_spec_default
> - (struct breakpoint *b, struct location_spec *locspec,
> - struct program_space *search_pspace);
> -
> static int can_use_hardware_watchpoint
> (const std::vector<value_ref_ptr> &vals);
>
> @@ -11692,7 +11688,21 @@ code_breakpoint::decode_location_spec (location_spec *locspec,
> if (locspec->type () == PROBE_LOCATION_SPEC)
> return bkpt_probe_decode_location_spec (this, locspec, search_pspace);
>
> - return decode_location_spec_default (this, locspec, search_pspace);
> + struct linespec_result canonical;
> +
> + decode_line_full (locspec, DECODE_LINE_FUNFIRSTLINE, search_pspace,
> + NULL, 0, &canonical, multiple_symbols_all,
> + filter.get ());
> +
> + /* We should get 0 or 1 resulting SALs. */
> + gdb_assert (canonical.lsals.size () < 2);
> +
> + if (!canonical.lsals.empty ())
> + {
> + const linespec_sals &lsal = canonical.lsals[0];
> + return std::move (lsal.sals);
> + }
> + return {};
> }
>
> /* Virtual table for internal breakpoints. */
> @@ -12750,31 +12760,6 @@ create_sals_from_location_spec_default (location_spec *locspec,
> parse_breakpoint_sals (locspec, canonical);
> }
>
> -/* Decode the line represented by S by calling decode_line_full. This is the
> - default function for the `decode_location' method of breakpoint_ops. */
> -
> -static std::vector<symtab_and_line>
> -decode_location_spec_default (struct breakpoint *b,
> - location_spec *locspec,
> - program_space *search_pspace)
> -{
> - struct linespec_result canonical;
> -
> - decode_line_full (locspec, DECODE_LINE_FUNFIRSTLINE, search_pspace,
> - NULL, 0, &canonical, multiple_symbols_all,
> - b->filter.get ());
> -
> - /* We should get 0 or 1 resulting SALs. */
> - gdb_assert (canonical.lsals.size () < 2);
> -
> - if (!canonical.lsals.empty ())
> - {
> - const linespec_sals &lsal = canonical.lsals[0];
> - return std::move (lsal.sals);
> - }
> - return {};
> -}
> -
> /* Reset a breakpoint. */
>
> static void
LGTM.
Simon
prev parent reply other threads:[~2022-09-29 23:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-29 23:35 Tom Tromey
2022-09-29 23:59 ` Simon Marchi [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2e9a3dab-8783-91b2-9ddf-64e72a5ad560@simark.ca \
--to=simark@simark.ca \
--cc=gdb-patches@sourceware.org \
--cc=tom@tromey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).