From: Pedro Alves <palves@redhat.com>
To: Simon Marchi <simon.marchi@efficios.com>, gdb-patches@sourceware.org
Subject: Re: [PATCH 1/2] gdb: cleanup of displaced_step_inferior_state::reset/displaced_step_clear
Date: Fri, 14 Feb 2020 19:39:00 -0000 [thread overview]
Message-ID: <fa2a6732-5db9-ca73-b1d6-fc3a535409ba@redhat.com> (raw)
In-Reply-To: <20200122151410.30012-1-simon.marchi@efficios.com>
On 1/22/20 3:14 PM, Simon Marchi wrote:
> displaced_step_inferior_state::reset and displaced_step_clear appear to
> have the same goal, but they don't do the same thing.
> displaced_step_inferior_state::reset clears more things than
> displaced_step_clear, but it misses free'ing the closure, which
> displaced_step_clear does.
>
> This patch replaces displaced_step_clear's implementation with just a call to
> displaced_step_inferior_state::reset. It then changes
> displaced_step_inferior_state::step_closure to be a unique_ptr, to indicate the
> fact that displaced_step_inferior_state owns the closure (and so that it is
> automatically freed when the field is reset).
>
> It should be possible to get rid of displaced_step_clear entirely, but I'm not
> sure what the best way, give that it's used in scope exit macros.
The reason it needs to be wrapped in a cleanup instead of say SCOPE_EXIT,
is that it needs to be discardable with the "cleanup.release ();" call.
I'm not sure there's a better way.
Renaming displaced_step_clear to displaced_step_reset and adding a comment
may result in clearer code, though.
> diff --git a/gdb/infrun.h b/gdb/infrun.h
> index 8040b28f0172..c6329c844d9b 100644
> --- a/gdb/infrun.h
> +++ b/gdb/infrun.h
> @@ -290,7 +290,7 @@ struct displaced_step_inferior_state
> failed_before = 0;
> step_thread = nullptr;
> step_gdbarch = nullptr;
> - step_closure = nullptr;
> + step_closure.reset ();
I see people sometimes doing this change and I'm curious.
Is it for clarity?
Anyway, this LGTM.
Thanks,
Pedro Alves
next prev parent reply other threads:[~2020-02-14 19:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 15:14 Simon Marchi
2020-01-22 15:20 ` [PATCH 2/2] gdb: make gdbarch_displaced_step_copy_insn return an std::unique_ptr Simon Marchi
2020-02-14 19:47 ` Pedro Alves
2020-02-14 19:48 ` Pedro Alves
2020-02-14 20:31 ` Simon Marchi
2020-02-13 22:52 ` [PATCH 1/2] gdb: cleanup of displaced_step_inferior_state::reset/displaced_step_clear Simon Marchi
2020-02-14 19:39 ` Pedro Alves [this message]
2020-02-14 20:11 ` Simon Marchi
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=fa2a6732-5db9-ca73-b1d6-fc3a535409ba@redhat.com \
--to=palves@redhat.com \
--cc=gdb-patches@sourceware.org \
--cc=simon.marchi@efficios.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).