From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 96904 invoked by alias); 9 Oct 2017 02:36:48 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 96891 invoked by uid 89); 9 Oct 2017 02:36:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: simark.ca Received: from simark.ca (HELO simark.ca) (158.69.221.121) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 09 Oct 2017 02:36:47 +0000 Received: from [10.0.0.11] (cable-192.222.251.162.electronicbox.net [192.222.251.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id CA2D41E517; Sun, 8 Oct 2017 22:36:45 -0400 (EDT) Subject: Re: [RFA] Remove some cleanups from dwarf2read.c To: Tom Tromey , gdb-patches@sourceware.org References: <20171008225305.22006-1-tom@tromey.com> From: Simon Marchi Message-ID: <65d89acd-8c12-e317-bef7-7cdbfe03a099@simark.ca> Date: Mon, 09 Oct 2017 02:36:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20171008225305.22006-1-tom@tromey.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2017-10/txt/msg00180.txt.bz2 On 2017-10-08 06:53 PM, Tom Tromey wrote: > @@ -9068,18 +9047,15 @@ dwarf2_physname (const char *name, struct die_info *die, struct dwarf2_cu *cu) > /* This is a lie, but we already lie to the caller new_symbol_full. > new_symbol_full assumes we return the mangled name. > This just undoes that lie until things are cleaned up. */ > - demangled = NULL; > } > else > { > - demangled = gdb_demangle (mangled, > - (DMGL_PARAMS | DMGL_ANSI | DMGL_RET_DROP)); > + demangled.reset (gdb_demangle (mangled, > + (DMGL_PARAMS | DMGL_ANSI > + | DMGL_RET_DROP))); It would be nice (as a future change) for gdb_demangle to return a unique_xmalloc_ptr. > @@ -11371,21 +11336,17 @@ lookup_dwo_cutu (struct dwarf2_per_cu_data *this_unit, > { > /* Print the name of the DWP file if we looked there, helps the user > better diagnose the problem. */ > - char *dwp_text = NULL; > - struct cleanup *cleanups; > + std::string dwp_text; > > if (dwp_file != NULL) > - dwp_text = xstrprintf (" [in DWP file %s]", lbasename (dwp_file->name)); > - cleanups = make_cleanup (xfree, dwp_text); > + dwp_text = string_printf (" [in DWP file %s]", lbasename (dwp_file->name)); 80 columns. Otherwise, LGTM. Simon