From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id KXpjNoh6OGlFTikAWB0awg (envelope-from ) for ; Tue, 09 Dec 2025 14:37:44 -0500 Received: by simark.ca (Postfix, from userid 112) id DBE281E08D; Tue, 09 Dec 2025 14:37:44 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 7907C1E08D for ; Tue, 09 Dec 2025 14:37:44 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 0DF7F4BA2E1C for ; Tue, 9 Dec 2025 19:37:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0DF7F4BA2E1C Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id E072A4BA2E00 for ; Tue, 9 Dec 2025 19:36:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E072A4BA2E00 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E072A4BA2E00 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1765308978; cv=none; b=c2nA5Pe7VUZSppC62lVZQSiyZ6tm5q/r4OBzT7+CBEvJoeVmv6gFDGWaWbPTfAWeqA/Mp9XX+LSHdPwzVBvNde+OAYr0RZfgWosRNuvKR7RKr7LA6z/bvrr35E6q27SbHbxyTFMhyyymGNMzF5O2N6iqWYhyLjVSCFP61NHkLZM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1765308978; c=relaxed/simple; bh=dUTsMIkB/HTmyPuT30cmyGmPsuH4R1ZKGVBvH05WwP4=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=A5Yhu5ZwzaBU/Xhq11gHA2OIe+WXF07VxgEMdvaCEPOw58H33URNfpNk/ZgK+e3EOl4QAPauA7j2yEw7fFORqOxQYSRaKBHaJY37C0pW453liRnsN3IoMj0rkt+7uS3WCk3y2gMEYBvM7Fibks7ClinZ2Ms+gIvjQO2AEKIImEA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E072A4BA2E00 Received: by simark.ca (Postfix) id A2BF71E0C5; Tue, 09 Dec 2025 14:36:15 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 07/11] gdb/solib-rocm: save inferior in rocm_solib_ops Date: Tue, 9 Dec 2025 14:32:11 -0500 Message-ID: <20251209193610.296085-8-simon.marchi@efficios.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251209193610.296085-1-simon.marchi@efficios.com> References: <20251209193610.296085-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org From: Simon Marchi Saving the inferior the rocm_solib_ops is for can avoid using `current_inferior ()` at a couple of places. Change-Id: Icf36bbef031eda7b776cd735a91a2ff918697dd3 --- gdb/solib-rocm.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gdb/solib-rocm.c b/gdb/solib-rocm.c index 81a1c0ab64c1..a1bbb1a54f42 100644 --- a/gdb/solib-rocm.c +++ b/gdb/solib-rocm.c @@ -186,7 +186,7 @@ struct rocm_solib_ops : public solib_ops in order to provide support for ROCm code objects. */ explicit rocm_solib_ops (inferior *inf, solib_ops_up host_ops) : solib_ops (inf->pspace), m_host_ops (std::move (host_ops)), - m_fd_cache (inf) + m_inf (inf), m_fd_cache (inf) { gdb_assert (m_host_ops != nullptr); gdb_assert (dynamic_cast (m_host_ops.get ()) == nullptr); @@ -257,10 +257,13 @@ struct rocm_solib_ops : public solib_ops private: owning_intrusive_list solibs_from_rocm_sos (const std::vector &sos); - gdb_bfd_iovec_base *bfd_iovec_open (bfd *abfd, inferior *inferior); + gdb_bfd_iovec_base *bfd_iovec_open (bfd *abfd); solib_ops_up m_host_ops; + /* Inferior this rocm_solib_ops is for. */ + inferior *m_inf; + /* List of code objects loaded into the inferior. */ std::vector m_solib_list; @@ -507,7 +510,7 @@ rocm_code_object_stream_memory::read (bfd *, void *buf, file_ptr size, } /* anonymous namespace */ gdb_bfd_iovec_base * -rocm_solib_ops::bfd_iovec_open (bfd *abfd, inferior *inferior) +rocm_solib_ops::bfd_iovec_open (bfd *abfd) { std::string_view uri (bfd_get_filename (abfd)); std::string_view protocol_delim = "://"; @@ -617,7 +620,7 @@ rocm_solib_ops::bfd_iovec_open (bfd *abfd, inferior *inferior) if (protocol == "memory") { ULONGEST pid = try_strtoulst (path); - if (pid != inferior->pid) + if (pid != m_inf->pid) { warning (_("`%s': code object is from another inferior"), std::string (uri).c_str ()); @@ -663,7 +666,7 @@ rocm_solib_ops::bfd_open (const char *pathname) auto open = [this] (bfd *nbfd) { - return this->bfd_iovec_open (nbfd, current_inferior ()); + return this->bfd_iovec_open (nbfd); }; gdb_bfd_ref_ptr abfd = gdb_bfd_openr_iovec (pathname, "elf64-amdgcn", open); @@ -752,9 +755,7 @@ rocm_solib_ops::create_inferior_hook (int from_tty) void rocm_solib_ops::update_solib_list () { - inferior *inf = current_inferior (); - - amd_dbgapi_process_id_t process_id = get_amd_dbgapi_process_id (inf); + amd_dbgapi_process_id_t process_id = get_amd_dbgapi_process_id (m_inf); if (process_id.handle == AMD_DBGAPI_PROCESS_NONE.handle) return; -- 2.52.0