Re: [PATCH] Use scoped_fd in linux-nat.c:proc_mem_file

[Simon Marchi <simark@simark.ca>]

On 2025-03-17 16:55, Tom Tromey wrote:
> This changes linux-nat.c:proc_mem_file to use a scoped_fd and fixes up
> the users.  Regression tested on x86-64 Fedora 40.
> ---
>  gdb/linux-nat.c | 29 +++++++++++++++--------------
>  1 file changed, 15 insertions(+), 14 deletions(-)
> 
> diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
> index b16f9f96726..8861829f917 100644
> --- a/gdb/linux-nat.c
> +++ b/gdb/linux-nat.c
> @@ -4029,24 +4029,26 @@ linux_nat_target::pid_to_exec_file (int pid)
>  class proc_mem_file
>  {
>  public:
> -  proc_mem_file (ptid_t ptid, int fd)
> -    : m_ptid (ptid), m_fd (fd)
> +  proc_mem_file (ptid_t ptid, scoped_fd fd)
> +    : m_ptid (ptid), m_fd (std::move (fd))
>    {
> -    gdb_assert (m_fd != -1);
> +    gdb_assert (m_fd.get () != -1);
>    }
>  
>    ~proc_mem_file ()
>    {
>      linux_nat_debug_printf ("closing fd %d for /proc/%d/task/%ld/mem",
> -			    m_fd, m_ptid.pid (), m_ptid.lwp ());
> -    close (m_fd);
> +			    m_fd.get (), m_ptid.pid (), m_ptid.lwp ());
>    }
>  
>    DISABLE_COPY_AND_ASSIGN (proc_mem_file);
>  
> -  int fd ()
> +  proc_mem_file (proc_mem_file &&) = default;
> +  proc_mem_file &operator= (proc_mem_file &&) = default;

Is it really needed to add the move constructor / move assignment
operator?  In fact, I would think that you could remove the
DISABLE_COPY_AND_ASSIGN, since just having the scoped_fd as a field will
do the right thing.

Otherwise, LGTM (Kevin already gave his AB).

Simon