From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id ubqOMg9nommgWQ0AWB0awg (envelope-from ) for ; Fri, 27 Feb 2026 22:54:55 -0500 Received: by simark.ca (Postfix, from userid 112) id 8BB921E09A; Fri, 27 Feb 2026 22:54:55 -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 1E6571E0E1 for ; Fri, 27 Feb 2026 22:54:53 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id CFFD64BAD160 for ; Sat, 28 Feb 2026 03:54:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CFFD64BAD160 Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id D24D64BA23C8 for ; Sat, 28 Feb 2026 03:54:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D24D64BA23C8 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 D24D64BA23C8 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=1772250868; cv=none; b=Hfco/pLcHjysF+ZYJ6ieR2TyNecg7b7vo1oGBnCiqTENEy44ptRbG8DkFOO5UUCke57OS9iw8/TpG7CaktzFQDBk9XrmPKfbAfeyZcxTaK8tCSVO6YXCwTmGNZsOZWNRaJH/qf3YS9fd+/0rOL6fIFnwUiS26cUD2rTfmehw0l4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1772250868; c=relaxed/simple; bh=NdUcc+311hoOhwkaXY0ZLeJtIAjO/oWeWJrbKK2WThw=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=Ql9Jwr7BCi/RLHAVLtYvC5g66NgFO/OWZj5xSOFEz1FcqbbFS4d57YkUizB9oPGYLYU+LaR94bIx7UeFiwesYR9h02yP3mP6V5R5FYfnJmo1iPUdJQpXdJuuJ8KC0f8HTFlKVnteam3JORDomkbEgOo1SeaMQf5G/0P3ugTeMjY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D24D64BA23C8 Received: by simark.ca (Postfix) id 611521E0DD; Fri, 27 Feb 2026 22:54:26 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH v3 2/9] gdb/ctf: add unique_ptr types Date: Fri, 27 Feb 2026 22:51:49 -0500 Message-ID: <20260228035425.422765-3-simon.marchi@efficios.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260228035425.422765-1-simon.marchi@efficios.com> References: <20260217195329.3833518-1-simon.marchi@polymtl.ca> <20260228035425.422765-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 Add ctf_archive_up and ctf_dict_up to automatically manage the lifetime of a ctf_archive_t or ctf_dict_t and use them. Change-Id: I51b3548b1bb28941c7bad776a11a238eb25789e4 --- gdb/ctfread.c | 56 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/gdb/ctfread.c b/gdb/ctfread.c index 141f51f621b0..6c1bbebcf2c8 100644 --- a/gdb/ctfread.c +++ b/gdb/ctfread.c @@ -125,29 +125,41 @@ ctf_kind_str (uint32_t kind) using ctf_type_map = gdb::unordered_map; +struct ctf_archive_closer +{ + void operator() (ctf_archive_t *arc) const noexcept + { + ctf_close (arc); + } +}; + +using ctf_archive_up = std::unique_ptr; + +struct ctf_dict_closer +{ + void operator() (ctf_dict_t *dict) const noexcept + { + ctf_dict_close (dict); + } +}; + +using ctf_dict_up = std::unique_ptr; + struct ctf_dict_info { - explicit ctf_dict_info (ctf_dict_t *dict) : dict (dict) {} - ~ctf_dict_info (); + explicit ctf_dict_info (ctf_archive_up archive, ctf_dict_up dict) + : archive (std::move (archive)), + dict (std::move (dict)) + {} /* Map from IDs to types. */ ctf_type_map type_map; - /* The dictionary. */ - ctf_dict_t *dict; + /* The archive and dictionary. */ + ctf_archive_up archive; + ctf_dict_up dict; }; -/* Cleanup function for the ctf_dict_key data. */ -ctf_dict_info::~ctf_dict_info () -{ - if (dict == nullptr) - return; - - ctf_archive_t *arc = ctf_get_arc (dict); - ctf_dict_close (dict); - ctf_close (arc); -} - static const registry::key ctf_dict_key; /* A CTF context consists of a file pointer and an objfile pointer. */ @@ -1542,26 +1554,28 @@ elfctf_build_psymtabs (struct objfile *of) CTF_SCOPED_DEBUG_START_END ("building psymtabs for %s", bfd_get_filename (abfd)); - ctf_archive_t *arc = ctf_bfdopen (abfd, &err); + ctf_archive_up arc (ctf_bfdopen (abfd, &err)); if (arc == nullptr) error (_("ctf_bfdopen failed on %s - %s"), bfd_get_filename (abfd), ctf_errmsg (err)); - ctf_dict_t *dict = ctf_dict_open (arc, NULL, &err); + ctf_dict_up dict (ctf_dict_open (arc.get (), NULL, &err)); if (dict == nullptr) error (_("ctf_dict_open failed on %s - %s"), bfd_get_filename (abfd), ctf_errmsg (err)); - ctf_dict_key.emplace (of, dict); - pcu.dict = dict; + ctf_dict_info &dict_info + = ctf_dict_key.emplace (of, std::move (arc), std::move (dict)); + + pcu.dict = dict_info.dict.get (); pcu.of = of; - pcu.arc = arc; + pcu.arc = dict_info.archive.get (); psymbol_functions *psf = new psymbol_functions (); of->qf.emplace_front (psf); pcu.psf = psf; - if (ctf_archive_iter (arc, build_ctf_archive_member, &pcu) < 0) + if (ctf_archive_iter (pcu.arc, build_ctf_archive_member, &pcu) < 0) error (_("ctf_archive_iter failed in input file %s: - %s"), bfd_get_filename (abfd), ctf_errmsg (err)); } -- 2.53.0