From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id rS8TGecToWYNejAAWB0awg (envelope-from ) for ; Wed, 24 Jul 2024 10:47:03 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=HXl2jQ61; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=9UVej4hI; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=HXl2jQ61; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=9UVej4hI; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 499B01E0C3; Wed, 24 Jul 2024 10:47:03 -0400 (EDT) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (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 002651E097 for ; Wed, 24 Jul 2024 10:47:00 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 69B103858C3A for ; Wed, 24 Jul 2024 14:47:00 +0000 (GMT) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id D7AF23858D29 for ; Wed, 24 Jul 2024 14:46:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D7AF23858D29 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D7AF23858D29 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721832402; cv=none; b=mdgJeZ5e6izSo+3mdS6WaWY4ziv2wqJXavkr4Y0k2WX5VPGlq+b2TDwHsUZFr8KDl7uwvWU6eB6Jl/KIesOFETuQAOXugHT39hpLOKaK7hgViJQORtUAJz+gu+N37mdjPTgvoM4EXBMU0WXypRiApd4C3jLUyKe5Auf0QM0BWNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721832402; c=relaxed/simple; bh=qQT3GwHOKTxaNja2oKfnY/f2hyIQHRtUjKhed/5H9vs=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature: Message-ID:Date:MIME-Version:Subject:From:To; b=S7XdDwrz/QFAscYvK42lO9rq+PTuZBwYo85pvl1BhalRbPanEfuSs6iUPQQB2fHd130iPQiklJ5eTuY8LDfLfAoN1lE+2StNEiYt5R4mOohSmmkpaJw34++D/P5jxL5QOjNWHXjw87VU4MI3e4925p6tfFl/XxDy0DlZpNNIPxQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D06491F7B0 for ; Wed, 24 Jul 2024 14:46:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1721832390; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g25YPq4DtMxN4kuDalfbXtzLy6UpABV1P3RplQ9zTn0=; b=HXl2jQ61ZcJ24oXFM4SW3m6RP/TaqXhS3rl1QDOm1ryQdRwP3WCC12KAPLQFdS5HAMj4EN d8H4zcyuBYt/c8kDaXT+HeY6EkmDIcrZe+9ahMmlh1fixMzuiUBZzofII0jnPkL/gSfBnM zr2nB9NU6GtZb35H294Xrq5IBepfUaI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1721832390; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g25YPq4DtMxN4kuDalfbXtzLy6UpABV1P3RplQ9zTn0=; b=9UVej4hIJvcrRpAf2lH++H9hLyP9wwbMg48ZPiHnOLGuNZG4YagocgDObECoz+8GumHPHR x81fW0Wt1k5FzqCg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1721832390; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g25YPq4DtMxN4kuDalfbXtzLy6UpABV1P3RplQ9zTn0=; b=HXl2jQ61ZcJ24oXFM4SW3m6RP/TaqXhS3rl1QDOm1ryQdRwP3WCC12KAPLQFdS5HAMj4EN d8H4zcyuBYt/c8kDaXT+HeY6EkmDIcrZe+9ahMmlh1fixMzuiUBZzofII0jnPkL/gSfBnM zr2nB9NU6GtZb35H294Xrq5IBepfUaI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1721832390; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g25YPq4DtMxN4kuDalfbXtzLy6UpABV1P3RplQ9zTn0=; b=9UVej4hIJvcrRpAf2lH++H9hLyP9wwbMg48ZPiHnOLGuNZG4YagocgDObECoz+8GumHPHR x81fW0Wt1k5FzqCg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id BBE0B1324F for ; Wed, 24 Jul 2024 14:46:30 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id Qmt9LMYToWZvKwAAD6G6ig (envelope-from ) for ; Wed, 24 Jul 2024 14:46:30 +0000 Message-ID: Date: Wed, 24 Jul 2024 16:46:55 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PING] [PATCH v2] [gdb/symtab] Simplify memory management in parse_macro_definition From: Tom de Vries To: gdb-patches@sourceware.org References: <20240626063233.19408-1-tdevries@suse.de> Content-Language: en-US In-Reply-To: <20240626063233.19408-1-tdevries@suse.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-4.09 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; XM_UA_NO_VERSION(0.01)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo] X-Spam-Level: X-Spam-Score: -4.09 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP 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~public-inbox=simark.ca@sourceware.org On 6/26/24 08:32, Tom de Vries wrote: > I noticed that parse_macro_definition does malloc and free, both for the > argv array and its elements. > > Make memory management simpler by introducing a new class > vector_c_string (copied from temporary_macro_definition here [1]) that uses an > std::vector for the argv array. > Ping. Thanks, - Tom > Tested on x86_64-linux. > > Co-Authored-By: Tom Tromey > > [1] https://sourceware.org/pipermail/gdb-patches/2024-April/208456.html > --- > gdb/dwarf2/macro.c | 67 +++++++++++++++++++++++++++++----------------- > 1 file changed, 43 insertions(+), 24 deletions(-) > > diff --git a/gdb/dwarf2/macro.c b/gdb/dwarf2/macro.c > index bc781c2cb92..e558a900a2c 100644 > --- a/gdb/dwarf2/macro.c > +++ b/gdb/dwarf2/macro.c > @@ -36,6 +36,34 @@ > #include "complaints.h" > #include "objfiles.h" > > +/* Vector of C strings. */ > + > +struct vector_c_string > +{ > + vector_c_string () = default; > + DISABLE_COPY_AND_ASSIGN (vector_c_string); > + > + ~vector_c_string () > + { > + free_vector_argv (argv); > + } > + > + /* Add element to vector. */ > + void push_back (gdb::unique_xmalloc_ptr &&value) > + { > + argv.push_back (value.release ()); > + } > + > + /* De-allocate elements and clear vector. */ > + void clear () > + { > + free_vector_argv (argv); > + argv.clear (); > + } > + > + std::vector argv; > +}; > + > static void > dwarf2_macro_malformed_definition_complaint (const char *arg1) > { > @@ -103,7 +131,7 @@ consume_improper_spaces (const char *p, const char *body) > > static void > parse_macro_definition (struct macro_source_file *file, int line, > - const char *body) > + const char *body, vector_c_string &tmp) > { > const char *p; > > @@ -159,15 +187,14 @@ parse_macro_definition (struct macro_source_file *file, int line, > > /* It's a function-like macro. */ > gdb_assert (*p == '('); > - std::string name (body, p - body); > - int argc = 0; > - int argv_size = 1; > - char **argv = XNEWVEC (char *, argv_size); > > + std::string name (body, p - body); > p++; > > p = consume_improper_spaces (p, body); > > + tmp.clear (); > + > /* Parse the formal argument list. */ > while (*p && *p != ')') > { > @@ -181,14 +208,9 @@ parse_macro_definition (struct macro_source_file *file, int line, > dwarf2_macro_malformed_definition_complaint (body); > else > { > - /* Make sure argv has room for the new argument. */ > - if (argc >= argv_size) > - { > - argv_size *= 2; > - argv = XRESIZEVEC (char *, argv, argv_size); > - } > - > - argv[argc++] = savestring (arg_start, p - arg_start); > + gdb::unique_xmalloc_ptr arg (savestring (arg_start, > + p - arg_start)); > + tmp.push_back (std::move (arg)); > } > > p = consume_improper_spaces (p, body); > @@ -209,15 +231,15 @@ parse_macro_definition (struct macro_source_file *file, int line, > if (*p == ' ') > /* Perfectly formed definition, no complaints. */ > macro_define_function (file, line, name.c_str (), > - argc, (const char **) argv, > - p + 1); > + tmp.argv.size (), > + (const char **) tmp.argv.data (), p + 1); > else if (*p == '\0') > { > /* Complain, but do define it. */ > dwarf2_macro_malformed_definition_complaint (body); > macro_define_function (file, line, name.c_str (), > - argc, (const char **) argv, > - p); > + tmp.argv.size (), > + (const char **) tmp.argv.data (), p); > } > else > /* Just complain. */ > @@ -226,11 +248,6 @@ parse_macro_definition (struct macro_source_file *file, int line, > else > /* Just complain. */ > dwarf2_macro_malformed_definition_complaint (body); > - > - for (int i = 0; i < argc; i++) > - xfree (argv[i]); > - > - xfree (argv); > } > > /* Skip some bytes from BYTES according to the form given in FORM. > @@ -446,6 +463,8 @@ dwarf_decode_macro_bytes (dwarf2_per_objfile *per_objfile, > int at_commandline; > const gdb_byte *opcode_definitions[256]; > > + vector_c_string tmp; > + > mac_ptr = dwarf_parse_macro_header (opcode_definitions, abfd, mac_ptr, > &offset_size, section_is_gnu); > if (mac_ptr == NULL) > @@ -563,7 +582,7 @@ dwarf_decode_macro_bytes (dwarf2_per_objfile *per_objfile, > line, current_file->filename); > } > else if (is_define) > - parse_macro_definition (current_file, line, body); > + parse_macro_definition (current_file, line, body, tmp); > else > { > gdb_assert (macinfo_type == DW_MACRO_undef > @@ -627,7 +646,7 @@ dwarf_decode_macro_bytes (dwarf2_per_objfile *per_objfile, > } > > if (macinfo_type == DW_MACRO_define_strx) > - parse_macro_definition (current_file, line, body); > + parse_macro_definition (current_file, line, body, tmp); > else > macro_undef (current_file, line, body); > } > > base-commit: bd54c881cd14af32f2347dab5ce51823ed631a88