From patchwork Mon Mar 10 15:10:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 107589 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 6A1E93858C39 for ; Mon, 10 Mar 2025 15:23:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6A1E93858C39 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=default header.b=gFzrE1Os X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 459013858C39 for ; Mon, 10 Mar 2025 15:20:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 459013858C39 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 459013858C39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741620055; cv=none; b=CPqlpIbHy54KCBO6fd4/EtvKY+3/ijTTDSWIwE/RhXTMO7fUmUNHKY9egAe96OzcKpkIGHSrO3eV3e2TPcWYj0NqPMMgdhQG6O869dCgKQ7q0+D1oonPNTBijsKWajnPo3bCwRz18XxZ5KMQ1wKDZ4WdKT2EfmOUg4VGA66I2hw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741620055; c=relaxed/simple; bh=laxRpPWlvoTpRfssKOaT4z+GHASb0amPk9D/ykKo4qY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=x9OBYhte6Lb5ttsfJOM42qHa75y+GNiSSFlVAqgE3HR4TXJRf9LgeG7ZQixpWb7x0G1cnn7VPhWzF6igkkR/WfNXzyWbf+TgASq6upUoLQDZGq3DcGzlux9ayBoMAYe641+8K7KjFODzdEJiBFyXlqeCo3fbFX9cArrbHZrY1UY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 459013858C39 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 52AFKoLi240775 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 10 Mar 2025 11:20:54 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 52AFKoLi240775 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1741620054; bh=OWxGUZCZxVh9cNRgPhZnl4ej7Fdnw2W5qU+Iy+sM99w=; h=From:To:Cc:Subject:Date:In-Reply-To:From; b=gFzrE1OsOXHV7nSHdO/77jpAMNDj2eu1tV7W0LF8ibCZwfHVqjA0Pmo22WV0mo4Up 75f+OEcaxdUKDMAlODKV+JoTgwtAohKKF9i6Tunbz9JaSLEFjesOj/VcR3L8zy74xK UD6Go7h/p4E3DDRZ8MOYoNxVeEidK874z44+TzhI= Received: by simark.ca (Postfix, from userid 112) id 6C1991E10A; Mon, 10 Mar 2025 11:12:16 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-Spam-Level: X-Spam-Status: No, score=-3187.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 Received: from simark.localdomain (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (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 910E11E114; Mon, 10 Mar 2025 11:12:13 -0400 (EDT) From: simon.marchi@polymtl.ca To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 4/4] gdb: change set_internalvar_function to take a unique pointer Date: Mon, 10 Mar 2025 11:10:49 -0400 Message-ID: <20250310151211.2708331-5-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310151211.2708331-1-simon.marchi@polymtl.ca> References: <20250310151211.2708331-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Mon, 10 Mar 2025 15:20:50 +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~patchwork=sourceware.org@sourceware.org From: Simon Marchi This makes the transfer of ownership a bit clearer, even though the internal_function is still held with a raw pointer inside internalval. Change-Id: Ie8d13270b64737b92291532acfbfcbc992b482b5 --- gdb/value.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gdb/value.c b/gdb/value.c index e36feaf81bed..ddc0959c2241 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -74,6 +74,8 @@ struct internal_function void *cookie; }; +using internal_function_up = std::unique_ptr; + /* Returns true if the ranges defined by [offset1, offset1+len1) and [offset2, offset2+len2) overlap. */ @@ -2297,13 +2299,13 @@ set_internalvar_string (struct internalvar *var, const char *string) } static void -set_internalvar_function (struct internalvar *var, struct internal_function *f) +set_internalvar_function (internalvar *var, internal_function_up f) { /* Clean up old contents. */ clear_internalvar (var); var->kind = INTERNALVAR_FUNCTION; - var->u.fn.function = f; + var->u.fn.function = f.release (); var->u.fn.canonical = 1; /* Variables installed here are always the canonical version. */ } @@ -2385,11 +2387,9 @@ static struct cmd_list_element * do_add_internal_function (const char *name, const char *doc, internal_function_fn_noside handler, void *cookie) { - struct internal_function *ifn; - struct internalvar *var = lookup_internalvar (name); - - ifn = new internal_function (name, handler, cookie); - set_internalvar_function (var, ifn); + set_internalvar_function (lookup_internalvar (name), + std::make_unique (name, handler, + cookie)); return add_cmd (name, no_class, function_command, doc, &functionlist); }