From patchwork Sun Jun 4 22:53:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 20788 Received: (qmail 51282 invoked by alias); 4 Jun 2017 22:54:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 51048 invoked by uid 89); 4 Jun 2017 22:54:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=cp, Hx-languages-length:5682 X-HELO: gproxy9.mail.unifiedlayer.com Received: from gproxy9-pub.mail.unifiedlayer.com (HELO gproxy9.mail.unifiedlayer.com) (69.89.20.122) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 04 Jun 2017 22:54:06 +0000 Received: from cmgw4 (unknown [10.0.90.85]) by gproxy9.mail.unifiedlayer.com (Postfix) with ESMTP id 2912B1E0751 for ; Sun, 4 Jun 2017 16:54:09 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id Umu51v00F2f2jeq01mu87R; Sun, 04 Jun 2017 16:54:09 -0600 X-Authority-Analysis: v=2.2 cv=QdwWhoTv c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=LWSFodeU3zMA:10 a=zstS-IiYAAAA:8 a=J4et7b0mE_BsuhHa_wsA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 174-29-39-24.hlrn.qwest.net ([174.29.39.24]:46932 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1dHePN-0001KK-Dd; Sun, 04 Jun 2017 16:54:05 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 2/2] C++-ify break-catch-throw Date: Sun, 4 Jun 2017 16:53:53 -0600 Message-Id: <20170604225353.18008-3-tom@tromey.com> In-Reply-To: <20170604225353.18008-1-tom@tromey.com> References: <20170604225353.18008-1-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1dHePN-0001KK-Dd X-Source-Sender: 174-29-39-24.hlrn.qwest.net (bapiya.Home) [174.29.39.24]:46932 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== This changes exception_catchpoint to be more of a C++ class, using std::string and std::vector, and updating the users. gdb/ChangeLog 2017-06-04 Tom Tromey * break-catch-throw.c (struct exception_catchpoint) : Now a std::string. : Now a unique_ptr. (~exception_catchpoint, check_status_exception_catchpoint) (print_one_detail_exception_catchpoint): Update. (handle_gnu_v3_exceptions): Change type of except_rx. (extract_exception_regexp): Return a std::string. (catch_exception_command_1): Update. --- gdb/ChangeLog | 11 +++++++++++ gdb/break-catch-throw.c | 49 +++++++++++++++++++++---------------------------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b89b47d..7be1267 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,16 @@ 2017-06-04 Tom Tromey + * break-catch-throw.c (struct exception_catchpoint) + : Now a std::string. + : Now a unique_ptr. + (~exception_catchpoint, check_status_exception_catchpoint) + (print_one_detail_exception_catchpoint): Update. + (handle_gnu_v3_exceptions): Change type of except_rx. + (extract_exception_regexp): Return a std::string. + (catch_exception_command_1): Update. + +2017-06-04 Tom Tromey + * break-catch-sig.c (gdb_signal_type): Remove typedef. (struct signal_catchpoint) : Now a std::vector. diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c index 7731c5e..5e88ad5 100644 --- a/gdb/break-catch-throw.c +++ b/gdb/break-catch-throw.c @@ -82,15 +82,15 @@ struct exception_catchpoint : public breakpoint enum exception_event_kind kind; - /* If non-NULL, an xmalloc'd string holding the source form of the - regular expression to match against. */ + /* If not empty, a string holding the source form of the regular + expression to match against. */ - char *exception_rx; + std::string exception_rx; - /* If non-NULL, an xmalloc'd, compiled regular expression which is + /* If non-NULL, a compiled regular expression which is used to determine which exceptions to stop on. */ - regex_t *pattern; + std::unique_ptr pattern; }; @@ -144,9 +144,8 @@ classify_exception_breakpoint (struct breakpoint *b) exception_catchpoint::~exception_catchpoint () { - xfree (this->exception_rx); if (this->pattern != NULL) - regfree (this->pattern); + regfree (this->pattern.get ()); } /* Implement the 'check_status' method. */ @@ -185,7 +184,7 @@ check_status_exception_catchpoint (struct bpstats *bs) if (!type_name.empty ()) { - if (regexec (self->pattern, type_name.c_str (), 0, NULL, 0) != 0) + if (regexec (self->pattern.get (), type_name.c_str (), 0, NULL, 0) != 0) bs->stop = 0; } } @@ -321,10 +320,10 @@ print_one_detail_exception_catchpoint (const struct breakpoint *b, const struct exception_catchpoint *cp = (const struct exception_catchpoint *) b; - if (cp->exception_rx != NULL) + if (!cp->exception_rx.empty ()) { uiout->text (_("\tmatching: ")); - uiout->field_string ("regexp", cp->exception_rx); + uiout->field_string ("regexp", cp->exception_rx.c_str ()); uiout->text ("\n"); } } @@ -373,18 +372,17 @@ print_recreate_exception_catchpoint (struct breakpoint *b, } static void -handle_gnu_v3_exceptions (int tempflag, char *except_rx, +handle_gnu_v3_exceptions (int tempflag, std::string &&except_rx, const char *cond_string, enum exception_event_kind ex_event, int from_tty) { - regex_t *pattern = NULL; + std::unique_ptr pattern; - if (except_rx != NULL) + if (!except_rx.empty ()) { - pattern = XNEW (regex_t); - make_cleanup (xfree, pattern); + pattern.reset (new regex_t); - compile_rx_or_error (pattern, except_rx, + compile_rx_or_error (pattern.get (), except_rx.c_str (), _("invalid type-matching regexp")); } @@ -396,8 +394,8 @@ handle_gnu_v3_exceptions (int tempflag, char *except_rx, the right thing. */ cp->type = bp_breakpoint; cp->kind = ex_event; - cp->exception_rx = except_rx; - cp->pattern = pattern; + cp->exception_rx = std::move (except_rx); + cp->pattern = std::move (pattern); re_set_exception_catchpoint (cp.get ()); @@ -415,7 +413,7 @@ handle_gnu_v3_exceptions (int tempflag, char *except_rx, STRING is updated to point to the "if" token, if it exists, or to the end of the string. */ -static char * +static std::string extract_exception_regexp (const char **string) { const char *start; @@ -440,8 +438,8 @@ extract_exception_regexp (const char **string) *string = last; if (last_space > start) - return savestring (start, last_space - start); - return NULL; + return std::string (start, last_space - start); + return std::string (); } /* Deal with "catch catch", "catch throw", and "catch rethrow" @@ -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); } /* Implementation of "catch catch" command. */