From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 14/18] Add constructor to exception_catchpoint
Date: Mon, 2 May 2022 16:15:49 -0600 [thread overview]
Message-ID: <20220502221553.1394743-15-tom@tromey.com> (raw)
In-Reply-To: <20220502221553.1394743-1-tom@tromey.com>
This adds a constructor to exception_catchpoint and simplifies the
caller.
---
gdb/break-catch-throw.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c
index a10334e9ae0..59e73da2c28 100644
--- a/gdb/break-catch-throw.c
+++ b/gdb/break-catch-throw.c
@@ -67,6 +67,17 @@ static const struct exception_names exception_functions[] =
struct exception_catchpoint : public base_breakpoint
{
+ exception_catchpoint (enum exception_event_kind kind_,
+ std::string &&except_rx)
+ : kind (kind_),
+ exception_rx (std::move (except_rx)),
+ pattern (exception_rx.empty ()
+ ? nullptr
+ : new compiled_regex (exception_rx.c_str (), REG_NOSUB,
+ _("invalid type-matching regexp")))
+ {
+ }
+
void re_set () override;
enum print_stop_action print_it (const bpstat *bs) const override;
bool print_one (bp_location **) const override;
@@ -355,20 +366,10 @@ handle_gnu_v3_exceptions (int tempflag, std::string &&except_rx,
const char *cond_string,
enum exception_event_kind ex_event, int from_tty)
{
- std::unique_ptr<compiled_regex> pattern;
-
- if (!except_rx.empty ())
- {
- pattern.reset (new compiled_regex (except_rx.c_str (), REG_NOSUB,
- _("invalid type-matching regexp")));
- }
-
- std::unique_ptr<exception_catchpoint> cp (new exception_catchpoint ());
+ std::unique_ptr<exception_catchpoint> cp
+ (new exception_catchpoint (ex_event, std::move (except_rx)));
init_catchpoint (cp.get (), get_current_arch (), tempflag, cond_string);
- cp->kind = ex_event;
- cp->exception_rx = std::move (except_rx);
- cp->pattern = std::move (pattern);
cp->re_set ();
--
2.34.1
next prev parent reply other threads:[~2022-05-02 22:16 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-02 22:15 [PATCH 00/18] Minor breakpoint cleanups Tom Tromey
2022-05-02 22:15 ` [PATCH 01/18] Change print_recreate_thread to a method Tom Tromey
2022-05-02 22:15 ` [PATCH 02/18] Remove breakpoint::ops Tom Tromey
2022-05-02 22:15 ` [PATCH 03/18] Boolify breakpoint::explains_signal Tom Tromey
2022-05-02 22:15 ` [PATCH 04/18] Move works_in_software_mode to watchpoint Tom Tromey
2022-05-02 22:15 ` [PATCH 05/18] Constify breakpoint::print_it Tom Tromey
2022-05-02 22:15 ` [PATCH 06/18] Constify breakpoint::print_one Tom Tromey
2022-05-02 22:15 ` [PATCH 07/18] Constify breakpoint::print_mention Tom Tromey
2022-05-02 22:15 ` [PATCH 08/18] Constify breakpoint::print_recreate Tom Tromey
2022-05-02 22:15 ` [PATCH 09/18] Remove unnecessary line from catch_exec_command_1 Tom Tromey
2022-05-02 22:15 ` [PATCH 10/18] Add constructor to fork_catchpoint Tom Tromey
2022-05-02 22:15 ` [PATCH 11/18] Add constructor to solib_catchpoint Tom Tromey
2022-05-02 22:15 ` [PATCH 12/18] Add constructor to signal_catchpoint Tom Tromey
2022-05-02 22:15 ` [PATCH 13/18] Add constructor to syscall_catchpoint Tom Tromey
2022-05-02 22:15 ` Tom Tromey [this message]
2022-05-02 22:15 ` [PATCH 15/18] Disable copying for breakpoint Tom Tromey
2022-05-02 22:15 ` [PATCH 16/18] Remove init_raw_breakpoint_without_location Tom Tromey
2022-05-03 19:26 ` Pedro Alves
2022-05-03 22:43 ` Tom Tromey
2022-05-02 22:15 ` [PATCH 17/18] Add initializers to tracepoint Tom Tromey
2022-05-02 22:15 ` [PATCH 18/18] Introduce catchpoint class Tom Tromey
2022-05-03 19:32 ` Pedro Alves
2022-05-03 23:02 ` Tom Tromey
2022-05-04 11:37 ` Pedro Alves
2022-05-07 2:19 ` Simon Marchi
2022-05-07 16:07 ` Tom Tromey
2022-05-07 19:31 ` Simon Marchi
2022-05-16 18:22 ` Tom Tromey
2022-05-16 19:29 ` Simon Marchi
2022-05-03 19:33 ` [PATCH 00/18] Minor breakpoint cleanups Pedro Alves
2022-05-06 18:03 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220502221553.1394743-15-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).