From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id eV+bHtTITmq11CwAWB0awg (envelope-from ) for ; Wed, 08 Jul 2026 18:01:56 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=Qc8kRn/I; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 788791E098; Wed, 08 Jul 2026 18:01:56 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable 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 F19081E04F for ; Wed, 08 Jul 2026 18:01:55 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 94D244BA2E15 for ; Wed, 8 Jul 2026 22:01:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 94D244BA2E15 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=Qc8kRn/I Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id B07AC4BA2E10 for ; Wed, 8 Jul 2026 22:00:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B07AC4BA2E10 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B07AC4BA2E10 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1783548038; cv=none; b=KC534O8zCTh6+JXvCW6NOSWjzdakUNDXHKvLOSQb2T+PA+NOlDrvfuvO/ufGneQ40bZ6CSYRiCFWnZNjeTcvgtqVAChlbtqxZfZ9r+Ku1g/X310IsArWEEccPM4026ZnGPOOQLFIhR92RY66Wul6p1gRsJXPYB+UJGBw2x/kF2o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1783548038; c=relaxed/simple; bh=+dC31qqx/F5+ikpqBuaajGBzDzkvkyNgqiUEq6lE8T4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=fiGrARRdOHu89Ai45pUakFByX/T+qwKVujAJyo4v6YUfEBcxAOp2ZyP2nnsnlRDmxWWIByWt/YPL41EK+0NpMkSdopbErSaKtsWKYvGnmtt6c133HYpFMBY5dvRe9ptnDFP+nR0VWHG+6DFD2RivyKy294gZsVzHyza6om2DJ8w= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=Qc8kRn/I DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B07AC4BA2E10 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 668M0RMj120692 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 8 Jul 2026 18:00:32 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 668M0RMj120692 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=oct2025; t=1783548033; bh=aqHyqXkGx2zhoJtGjjJyjY3nUkmXwzSvEM2Wc1MFBV4=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=Qc8kRn/IUesvnRIvbqGTPoBEFPP3+wCW7ms3jrYdwgrejs8DNxOzFuMoZS2cvmLj4 fyNsq0p+2umeilhQ4gYBj4ihOcbh95YwjIriVJ2xj0jwpCkbBJzFQCu0uV2oMA7KRC FQ60Vy9ZV6iyzEgLlYBdxpt3DIMSuw+nvcU3bv8p6He8BG76aUaNVThLARAonN42CO RJArOERD7zBphsfBfRgfitbHWTPhT5su46vUospAtA7+iJjTRFM4vz2wF/vdzoNl9Y j2jADL5nZqRZ7u4RNjiDSVZj45ynYmNdpynWTlNvG2uTmJogx39WOrUnZsf1X0iAr0 hQRetRtGl71gg== Received: by simark.ca (Postfix) id A434C1E0AF; Wed, 08 Jul 2026 17:51:52 -0400 (EDT) From: simon.marchi@polymtl.ca To: gdb-patches@sourceware.org Cc: Tom Tromey , Lancelot SIX , Simon Marchi , Lancelot Six Subject: [PATCH v3 07/10] gdb/solib-rocm: save inferior in rocm_solib_ops Date: Wed, 8 Jul 2026 17:51:39 -0400 Message-ID: <20260708215145.93134-8-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260708215145.93134-1-simon.marchi@polymtl.ca> References: <20260708215145.93134-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Wed, 8 Jul 2026 22:00:27 +0000 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 Storing the inferior in rocm_solib_ops lets us avoid some calls to current_inferior(). Change-Id: Icf36bbef031eda7b776cd735a91a2ff918697dd3 Approved-by: Lancelot Six (amdgpu) --- 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 00b97dbdde22..6f8ba8c00ac4 100644 --- a/gdb/solib-rocm.c +++ b/gdb/solib-rocm.c @@ -189,7 +189,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); @@ -260,10 +260,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; @@ -510,7 +513,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 = "://"; @@ -637,7 +640,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 ()); @@ -683,7 +686,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); @@ -772,9 +775,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.55.0