From patchwork Tue Feb 6 17:14:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 85368 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 320D1385840C for ; Tue, 6 Feb 2024 17:16:07 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 58C173858285 for ; Tue, 6 Feb 2024 17:15:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 58C173858285 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 58C173858285 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=1707239719; cv=none; b=Xz+xDPfby8/jYoBWC4luKIEXZuayYbRDDJM+tXFf6VSkojhsFtFkBLC5zGu06eUFiKOBddoBpdtw30nOp36+mAPrGaIl8IzqYBpVNz0Qp68dqd+gLgn/cKWhM/oc7E0ouHjuC6g8O8N6BZMJk/17z0LwbmQlBve3A/n3uxrxGsI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707239719; c=relaxed/simple; bh=9/Hb2WqbggwgzFrRL0+EqRXsNFQ8ehd3/cOl2hqNCXU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=RpwBAFtqAR0rMismH0q7nvNzTo0DgKBIvqdCHwNTclvYZVP+9evGyHeBLBIXvfZ38xAYXI7It4NQfzwDFKzUsYTFVXG3Oz5DPT+ZmzBPPUuEf+8KUFS+XouxT8TRFBnWwAyl36asYzt8pXCxLgpMHXTtDkAWf/JqVjhSepZd9Kw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (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 ESMTPSA id B59781E110; Tue, 6 Feb 2024 12:15:16 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 4/5] gdb: add program_space parameter to clear_solib Date: Tue, 6 Feb 2024 12:14:26 -0500 Message-ID: <20240206171514.119244-5-simon.marchi@efficios.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240206171514.119244-1-simon.marchi@efficios.com> References: <20240206171514.119244-1-simon.marchi@efficios.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3496.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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+patchwork=sourceware.org@sourceware.org Make the current_program_space reference bubble up one level. Remove one unnecessary declaration of clear_solib. Change-Id: I234e2c8c0b71713364fc7b76cee2bee2b026bd6d --- gdb/corelow.c | 2 +- gdb/solib.c | 21 ++++++++++++--------- gdb/solib.h | 6 +++--- gdb/symtab.h | 4 ---- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/gdb/corelow.c b/gdb/corelow.c index 43c1f69b1317..f291b2aba191 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -335,7 +335,7 @@ core_target::clear_core () /* Clear out solib state while the bfd is still open. See comments in clear_solib in solib.c. */ - clear_solib (); + clear_solib (current_program_space); current_program_space->cbfd.reset (nullptr); } diff --git a/gdb/solib.c b/gdb/solib.c index 98cda039a833..bd69c549b8e8 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -1180,23 +1180,26 @@ solib_keep_data_in_core (CORE_ADDR vaddr, unsigned long size) return false; } -/* Called by free_all_symtabs */ +/* See solib.h. */ void -clear_solib (void) +clear_solib (program_space *pspace) { - const solib_ops *ops = gdbarch_so_ops (current_inferior ()->arch ()); + inferior *inf = find_inferior_for_program_space (pspace); + gdb_assert (inf != nullptr); + + const solib_ops *ops = gdbarch_so_ops (inf->arch ()); - disable_breakpoints_in_shlibs (current_program_space); + disable_breakpoints_in_shlibs (pspace); - current_program_space->so_list.clear_and_dispose ([] (solib *so) { - notify_solib_unloaded (current_program_space, *so); - current_program_space->remove_target_sections (so); + pspace->so_list.clear_and_dispose ([pspace] (solib *so) { + notify_solib_unloaded (pspace, *so); + pspace->remove_target_sections (so); delete so; }); if (ops->clear_solib != nullptr) - ops->clear_solib (current_program_space); + ops->clear_solib (pspace); } /* Shared library startup support. When GDB starts up the inferior, @@ -1244,7 +1247,7 @@ no_shared_libraries (const char *ignored, int from_tty) access to their associated objfiles. Therefore, we can not purge the solibs' objfiles before clear_solib has been called. */ - clear_solib (); + clear_solib (current_program_space); objfile_purge_solibs (); } diff --git a/gdb/solib.h b/gdb/solib.h index 69183278318b..f7a93c0718f0 100644 --- a/gdb/solib.h +++ b/gdb/solib.h @@ -42,10 +42,10 @@ extern bool debug_solib; #define SOLIB_SCOPED_DEBUG_START_END(fmt, ...) \ scoped_debug_start_end (debug_solib, "solib", fmt, ##__VA_ARGS__) -/* Called when we free all symtabs, to free the shared library information - as well. */ +/* Called when we free all symtabs of PSPACE, to free the shared library + information as well. */ -extern void clear_solib (void); +extern void clear_solib (program_space *pspace); /* Called to add symbols from a shared library to gdb's symbol table. */ diff --git a/gdb/symtab.h b/gdb/symtab.h index 3b067a77b3c8..ca5a5b0f7fde 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -2423,10 +2423,6 @@ extern bool find_line_pc_range (struct symtab_and_line, CORE_ADDR *, extern void resolve_sal_pc (struct symtab_and_line *); -/* solib.c */ - -extern void clear_solib (void); - /* The reason we're calling into a completion match list collector function. */ enum class complete_symbol_mode