From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta36.uswest2.a.cloudfilter.net (omta36.uswest2.a.cloudfilter.net [35.89.44.35]) by sourceware.org (Postfix) with ESMTPS id 71FF93858D32 for ; Sun, 21 Apr 2024 17:00:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 71FF93858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 71FF93858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713718809; cv=none; b=oYbn3uGkXJeFZc2o8f59Dy8D9fXYPWIgeRzilxEnVU3Z/HecMBGdKpNTtYcsmbCCsKB1EZHXYOnp2L+iDKyPkzTGG8ChBVVPBpQgdGmdrrJ3kR3NBmjMiD7V7efHP3d+oVzRh0nWi14cASXTltaSS54bMTnVVtlJx1/TGURXnhA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713718809; c=relaxed/simple; bh=M33kCx4IkqgWOdDFeqqEc0pgKkiu+FkIGhjmnkE84DE=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=KsgrW0l6L+Fvv1FDqFw2jXvRSQxfuQ/XseVmNKYfxVRIVJgFSAuo6o3jmpvneSSBLFuV8c6YUklkVEQSxuQBuIlonrMl/Fq5HZ8o5MfrXckUnM5yZV5SxwoYLAUuppPzwh2EUxHfj5O8YtFupvuvaYXvsDTMJtPM5+9y+/bpr9w= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6009a.ext.cloudfilter.net ([10.0.30.184]) by cmsmtp with ESMTPS id yZz2rdCrJtf2QyaXsr8MA2; Sun, 21 Apr 2024 17:00:04 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id yaXrrMmwunNCOyaXrrqNra; Sun, 21 Apr 2024 17:00:03 +0000 X-Authority-Analysis: v=2.4 cv=DKCJ4TNb c=1 sm=1 tr=0 ts=66254613 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=raytVjVEu-sA:10 a=Qbun_eYptAEA:10 a=bIOnnnKIXOO2lmqm6MUA:9 a=QEXdDO2ut3YA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=J0j3eF3oob432FfBCeu7fYv3MYcdi4xmeETvrSFv7j0=; b=piD0Im8zpR3RFT2gPnGoUw8q7z U5Amc6grD+0f3+3f4zsH9pNeoFgD1AOURspjajuM0o4UwOD+Mk5WQXeKakl2cf2AmkOfBvZ4DKldn 8LU7j6tUYV/jIGReTvXa7O0A9; Received: from 97-122-86-252.hlrn.qwest.net ([97.122.86.252]:53968 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1ryaXr-003wVC-0i for gdb-patches@sourceware.org; Sun, 21 Apr 2024 11:00:03 -0600 From: Tom Tromey Date: Sun, 21 Apr 2024 11:00:03 -0600 Subject: [PATCH 03/10] Clean up demangle_parse_info MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240421-canon-fixes-v1-3-4dc4791d270d@tromey.com> References: <20240421-canon-fixes-v1-0-4dc4791d270d@tromey.com> In-Reply-To: <20240421-canon-fixes-v1-0-4dc4791d270d@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.13.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.86.252 X-Source-L: No X-Exim-ID: 1ryaXr-003wVC-0i X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-86-252.hlrn.qwest.net ([192.168.0.21]) [97.122.86.252]:53968 X-Source-Auth: tom+tromey.com X-Email-Count: 4 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfI1n/hsdVIPKoa5HsUNHYIz0UWO4J8EaCZ0rx9Eq973M1YXFDMoyLWIeMKgtswxPQ1yR8GYvX1IHqfJY5AvQ2DY6exJDQbVawU/s+8RWFfS1xVYGNyQQ RVtJyHZuSEZlT0+oWa6lgWX3LTwpxU6VHzDkOLpQLm2ZmuN/c9jtYkWBta5i9OK0BD3PvbxwWII0ke56PKWA6qjTZPd7RqaDKNA= X-Spam-Status: No, score=-3021.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_MSPIKE_H2,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 List-Id: This changes demangle_parse_info to use inline initializers and to remove some manual memory management. --- gdb/cp-name-parser.y | 12 ------------ gdb/cp-support.h | 8 ++++---- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y index 9f4561a36b4..2f73be35f37 100644 --- a/gdb/cp-name-parser.y +++ b/gdb/cp-name-parser.y @@ -1959,15 +1959,6 @@ cp_comp_to_string (struct demangle_component *result, int estimated_len) return gdb::unique_xmalloc_ptr (res); } -/* Constructor for demangle_parse_info. */ - -demangle_parse_info::demangle_parse_info () -: info (NULL), - tree (NULL) -{ - obstack_init (&obstack); -} - /* Destructor for demangle_parse_info. */ demangle_parse_info::~demangle_parse_info () @@ -1980,9 +1971,6 @@ demangle_parse_info::~demangle_parse_info () free (info); info = next; } - - /* Free any memory allocated during typedef replacement. */ - obstack_free (&obstack, NULL); } /* Merge the two parse trees given by DEST and SRC. The parse tree diff --git a/gdb/cp-support.h b/gdb/cp-support.h index 4015126154b..d0bedcd7b80 100644 --- a/gdb/cp-support.h +++ b/gdb/cp-support.h @@ -58,18 +58,18 @@ struct using_direct; struct demangle_parse_info { - demangle_parse_info (); + demangle_parse_info () = default; ~demangle_parse_info (); /* The memory used during the parse. */ - struct demangle_info *info; + struct demangle_info *info = nullptr; /* The result of the parse. */ - struct demangle_component *tree; + struct demangle_component *tree = nullptr; /* Any temporary memory used during typedef replacement. */ - struct obstack obstack; + auto_obstack obstack; }; -- 2.44.0