From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 87559 invoked by alias); 5 Jun 2017 10:33:59 -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 87471 invoked by uid 89); 5 Jun 2017 10:33:57 -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 autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 05 Jun 2017 10:33:56 +0000 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4334280460; Mon, 5 Jun 2017 10:33:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4334280460 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=palves@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4334280460 Received: from [127.0.0.1] (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B73E17988; Mon, 5 Jun 2017 10:33:58 +0000 (UTC) Subject: Re: [RFA 2/2] C++-ify break-catch-throw To: Tom Tromey , gdb-patches@sourceware.org References: <20170604225353.18008-1-tom@tromey.com> <20170604225353.18008-3-tom@tromey.com> From: Pedro Alves Message-ID: <01e777c7-a287-8dfe-dd21-370690ed6629@redhat.com> Date: Mon, 05 Jun 2017 10:33:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2017-06/txt/msg00104.txt.bz2 On 06/05/2017 11:21 AM, Pedro Alves wrote: > On 06/04/2017 11:53 PM, Tom Tromey wrote: >> @@ -452,17 +450,14 @@ catch_exception_command_1 (enum exception_event_kind ex_event, >> char *arg_entry, >> int tempflag, int from_tty) >> { >> - char *except_rx; >> const char *cond_string = NULL; >> - struct cleanup *cleanup; >> const char *arg = arg_entry; >> >> if (!arg) >> arg = ""; >> arg = skip_spaces_const (arg); >> >> - except_rx = extract_exception_regexp (&arg); >> - cleanup = make_cleanup (xfree, except_rx); >> + std::string except_rx = extract_exception_regexp (&arg); >> >> cond_string = ep_parse_optional_if_clause (&arg); >> >> @@ -474,10 +469,8 @@ catch_exception_command_1 (enum exception_event_kind ex_event, >> && ex_event != EX_EVENT_RETHROW) >> error (_("Unsupported or unknown exception event; cannot catch it")); >> >> - handle_gnu_v3_exceptions (tempflag, except_rx, cond_string, >> + handle_gnu_v3_exceptions (tempflag, std::move (except_rx), cond_string, >> ex_event, from_tty); >> - >> - discard_cleanups (cleanup); >> } > > Something looks suspicious to me -- compile_rx_or_error returns with > an installed cleanup that calls regfree, and handle_gnu_v3_exceptions > leaves it installed too. Maybe the cleanest would be to add a wrapper around regex_t, and replace compile_rx_or_error with a ctor that throws, like: class gdb_regex { public: // replaces old compile_rx_or_error gdb_regex (const char *rx, const char *message) { gdb_assert (rx != NULL); int code = regcomp (&m_pattern, rx, REG_NOSUB); if (code != 0) { gdb::unique_xmalloc_ptr err = get_regcomp_error (code, &m_pattern); error (("%s: %s"), message, err.get ()); } } ~gdb_regex () { regfree (&m_pattern); } // add convenience methods as needed. private: regex_t m_pattern; }; and use it throughout. Thanks, Pedro Alves