From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id YVQZAMJ6OGkyTikAWB0awg (envelope-from ) for ; Tue, 09 Dec 2025 14:38:42 -0500 Received: by simark.ca (Postfix, from userid 112) id F00C61E0B3; Tue, 09 Dec 2025 14:38:41 -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 BF67C1E0AB for ; Tue, 09 Dec 2025 14:38:39 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 5DD4E4BA23D2 for ; Tue, 9 Dec 2025 19:38:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5DD4E4BA23D2 Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 5728F4BA2E24 for ; Tue, 9 Dec 2025 19:38:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5728F4BA2E24 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 5728F4BA2E24 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=1765309096; cv=none; b=s3ZeRkRv6r2vW6Ea5JGNBsx6iWrEE2g/CeosboE7oGUbFyn4BHc8g260kqvfvxuKu0A0pVK3srp8M+Ds33xfphkBKrAk96fOw0mVlQnBJWc9IM6Rge0bpmcm0BygZynvEAWAXCk+OjuU6dBzbs46QR2Z3afe5T49baCqbDl8MUk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1765309096; c=relaxed/simple; bh=EgrtfCry7n0Mc359ON9UXzZzawkUIG4b5lfoir/mheI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=j4TNKV48ZuPIAbmbj9XpkqdIeP6VhdHozHW7ptMHf8Wiuv1v3NjKztt1qbqa/pJDjRFt6KJ/49BoRdDMaIFWHn3zRIk7ZeZxqm38KixqOSCcuxLRKjvmrgZnnZ8YCs6TxYHPxFoolx2Q5JUNOmFEvUtN+b3rN6fUV17uxJratR8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5728F4BA2E24 Received: by simark.ca (Postfix) id EDE3C1E0AB; Tue, 09 Dec 2025 14:38:15 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 09/11] gdb: add objfile -> solib backlink Date: Tue, 9 Dec 2025 14:32:13 -0500 Message-ID: <20251209193610.296085-10-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 The following "multiple solib_ops" patch will require accessing the solib(s) related to an objfile fairly often. To make that easier, add an objfile to solib backlink. However, I learned that there may be more than one solib linked to one objfile, so this backlink is actually a vector. Rename find_solib_for_objfile to find_one_solib_for_objfile to reflect that this function returns just one of possible multiple solibs for the given objfile (if that ever matters). To be clear, this doesn't change its behavior, this is what it was doing before this patch. Change-Id: I427d19407fdbc274b1790e0cae3004ee5fdbea72 --- gdb/objfiles.h | 23 +++++++++++++++++++++++ gdb/solib-svr4.c | 16 ++++++++-------- gdb/solib.c | 13 +++++++++---- 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/gdb/objfiles.h b/gdb/objfiles.h index f65f3bde930d..9e4a800dda9e 100644 --- a/gdb/objfiles.h +++ b/gdb/objfiles.h @@ -469,6 +469,25 @@ struct objfile : intrusive_list_node /* Return the program space associated with this objfile. */ program_space *pspace () { return m_pspace; } + /* Return the list of struct solib associated to this objfile. */ + std::vector &solibs () { return m_solibs; } + + /* Add SOLIB to the list of solibs associated to this objfile. */ + void add_solib (solib &solib) + { + gdb_assert (std::find (m_solibs.begin (), m_solibs.end (), &solib) + == m_solibs.end ()); + m_solibs.emplace_back (&solib); + } + + /* Remove SOLIB from the list of solibs associated to this objfile. */ + void remove_solib (solib &solib) + { + auto it = std::find (m_solibs.begin (), m_solibs.end (), &solib); + gdb_assert (it != m_solibs.end ()); + m_solibs.erase (it); + } + using compunit_symtab_iterator = owning_intrusive_list::iterator; using compunit_symtab_range = iterator_range; @@ -715,6 +734,10 @@ struct objfile : intrusive_list_node program_space *m_pspace; + /* The solibs associated to this objfile. This is a 1 objfile to N solibs + relationship (see solib.c for details). */ + std::vector m_solibs; + public: /* The object file's BFD. Can be null if the objfile contains only minimal symbols (e.g. the run time common symbols for SunOS4) or diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 7fd067ff38ab..f0f13c16bb03 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -3595,10 +3595,10 @@ lp64_svr4_solib_ops::fetch_link_map_offsets () const } -/* Return the DSO matching OBJFILE or nullptr if none can be found. */ +/* Return one solib matching OBJFILE or nullptr if none can be found. */ -static const solib * -find_solib_for_objfile (struct objfile *objfile) +static solib * +find_one_solib_for_objfile (struct objfile *objfile) { if (objfile == nullptr) return nullptr; @@ -3608,9 +3608,9 @@ find_solib_for_objfile (struct objfile *objfile) if (objfile->separate_debug_objfile_backlink != nullptr) objfile = objfile->separate_debug_objfile_backlink; - for (const solib &so : current_program_space->solibs ()) - if (so.objfile == objfile) - return &so; + if (const auto &solibs = objfile->solibs (); + !solibs.empty ()) + return solibs.front (); return nullptr; } @@ -3679,7 +3679,7 @@ svr4_solib_ops::iterate_over_objfiles_in_search_order r_debug object, defaulting to the initial namespace. */ svr4_info *info = get_svr4_info (current_program_space); CORE_ADDR default_debug_base = this->default_debug_base (info); - const solib *curr_solib = find_solib_for_objfile (current_objfile); + const solib *curr_solib = find_one_solib_for_objfile (current_objfile); CORE_ADDR debug_base = find_debug_base_for_solib (curr_solib); if (debug_base == 0) debug_base = default_debug_base; @@ -3694,7 +3694,7 @@ svr4_solib_ops::iterate_over_objfiles_in_search_order If we fail, e.g. for manually added symbol files or for the main executable, we assume that they were added to the initial namespace. */ - const solib *solib = find_solib_for_objfile (&objfile); + const solib *solib = find_one_solib_for_objfile (&objfile); CORE_ADDR solib_base = find_debug_base_for_solib (solib); if (solib_base == 0) solib_base = default_debug_base; diff --git a/gdb/solib.c b/gdb/solib.c index 9f6cc26b63b4..33dd4b2b1a32 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -662,6 +662,7 @@ solib_read_symbols (solib &so, symfile_add_flags flags) so.objfile->addr_low = so.addr_low; } + so.objfile->add_solib (so); so.symbols_loaded = true; } catch (const gdb_exception_error &e) @@ -732,10 +733,14 @@ remove_solib (program_space *pspace, notify_solib_unloaded (pspace, *solib_it, still_in_use, false); /* Unless the user loaded it explicitly, free SO's objfile. */ - if (solib_it->objfile != nullptr - && !(solib_it->objfile->flags & OBJF_USERLOADED) - && !still_in_use) - solib_it->objfile->unlink (); + if (solib_it->objfile != nullptr) + { + /* Remove the objfile -> solib backlink. */ + solib_it->objfile->remove_solib (*solib_it); + + if (!(solib_it->objfile->flags & OBJF_USERLOADED) && !still_in_use) + solib_it->objfile->unlink (); + } pspace->deleted_solibs.push_back (solib_it->name); -- 2.52.0