Re: [PATCH 3/11] gdb/solib-rocm: pass reference to cache to rocm_code_object_stream_file

[Lancelot SIX <lancelot.six@amd.com>]

On Tue, Dec 09, 2025 at 02:32:07PM -0500, Simon Marchi wrote:
> ~rocm_code_object_stream_file obtains the fd cache to call "close" on
> using its m_inf field, obtaining the per-inferior info using
> get_solib_info.  A patch later in this series moves the fd cache from
> the per-inferior registry to the rocm_solib_ops directly.  This implies
> that we will need a new way to get a reference to the fd_cache owning
> the fd, as it won't be easy to get it from the inferior anymore.
> 
> To achieve this, update rocm_code_object_stream_file to keep a reference
> to the fd cache directly (because the rocm_code_object_stream is not
> meant to be copied nor moved, make the field a reference).  The inferior
> parameter and field are not needed anymore.
> 
> Change-Id: Ia10f8f125840274e51e188cafcb7384fdff92240
> ---
>  gdb/solib-rocm.c | 19 +++++++++----------
>  1 file changed, 9 insertions(+), 10 deletions(-)
> 
> diff --git a/gdb/solib-rocm.c b/gdb/solib-rocm.c
> index a9573f8eefde..bde34bafd8b1 100644
> --- a/gdb/solib-rocm.c
> +++ b/gdb/solib-rocm.c
> @@ -360,8 +360,8 @@ struct rocm_code_object_stream_file final : rocm_code_object_stream
>  {
>    DISABLE_COPY_AND_ASSIGN (rocm_code_object_stream_file);
>  
> -  rocm_code_object_stream_file (inferior *inf, int fd, ULONGEST offset,
> -				ULONGEST size);
> +  rocm_code_object_stream_file (rocm_solib_fd_cache &fd_cache, int fd,
> +				ULONGEST offset, ULONGEST size);

Just noting that this does not apply anymore, just need to change
"int fd" to "target_fd fd".

Other than that, this looks good to me.

Thanks.

Approved-by: Lancelot Six <lancelot.six@amd.com> (amdgpu)

>  
>    file_ptr read (bfd *abfd, void *buf, file_ptr size,
>  		 file_ptr offset) override;
> @@ -371,9 +371,8 @@ struct rocm_code_object_stream_file final : rocm_code_object_stream
>    ~rocm_code_object_stream_file () override;
>  
>  protected:
> -
> -  /* The inferior owning this code object stream.  */
> -  inferior *m_inf;
> +  /* The fd cache owning this code object stream.  */
> +  rocm_solib_fd_cache &m_fd_cache;
>  
>    /* The target file descriptor for this stream.  */
>    int m_fd;
> @@ -387,8 +386,9 @@ struct rocm_code_object_stream_file final : rocm_code_object_stream
>  };
>  
>  rocm_code_object_stream_file::rocm_code_object_stream_file
> -  (inferior *inf, int fd, ULONGEST offset, ULONGEST size)
> -  : m_inf (inf), m_fd (fd), m_offset (offset), m_size (size)
> +  (rocm_solib_fd_cache &fd_cache, int fd, ULONGEST offset,
> +   ULONGEST size)
> +  : m_fd_cache (fd_cache), m_fd (fd), m_offset (offset), m_size (size)
>  {
>  }
>  
> @@ -453,9 +453,8 @@ rocm_code_object_stream_file::size ()
>  
>  rocm_code_object_stream_file::~rocm_code_object_stream_file ()
>  {
> -  auto info = get_solib_info (m_inf);
>    fileio_error target_errno;
> -  if (info->fd_cache.close (m_fd, &target_errno) != 0)
> +  if (m_fd_cache.close (m_fd, &target_errno) != 0)
>      warning (_("Failed to close solib: %s"),
>  	     strerror (fileio_error_to_host (target_errno)));
>  }
> @@ -608,7 +607,7 @@ rocm_bfd_iovec_open (bfd *abfd, inferior *inferior)
>  	      return nullptr;
>  	    }
>  
> -	  return new rocm_code_object_stream_file (inferior, fd, offset,
> +	  return new rocm_code_object_stream_file (info->fd_cache, fd, offset,
>  						   size);
>  	}
>  
> -- 
> 2.52.0