From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1551) id 57C1E38308A8; Fri, 20 May 2022 19:43:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 57C1E38308A8 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Pedro Alves To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Make exception_catchpoint inherit base_breakpoint instead of catchpoint X-Act-Checkin: binutils-gdb X-Git-Author: Pedro Alves X-Git-Refname: refs/heads/master X-Git-Oldrev: 7a3e3265ed47704e08ec7d3a276204eb62d35811 X-Git-Newrev: 249dfeafc96db9d36ea8c22f0ae3c3eb5b76b5ba Message-Id: <20220520194334.57C1E38308A8@sourceware.org> Date: Fri, 20 May 2022 19:43:34 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 May 2022 19:43:34 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D249dfeafc96d= b9d36ea8c22f0ae3c3eb5b76b5ba commit 249dfeafc96db9d36ea8c22f0ae3c3eb5b76b5ba Author: Pedro Alves Date: Sat May 7 01:18:34 2022 +0100 Make exception_catchpoint inherit base_breakpoint instead of catchpoint =20 exception_catchpoint is really a code breakpoint, with locations set by sals, re-set like other code breakpoints, etc., so make it inherit base_breakpoint. =20 This adds a bit of duplicated code to exception_catchpoint's ctor (copied from struct catchpoint's ctor), but it will be eliminated in a following patch. =20 Change-Id: I9fbb2927491120e9744a4f5e5cb5e6870ca07009 Diff: --- gdb/break-catch-throw.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c index f15fa531519..90fc3e6d325 100644 --- a/gdb/break-catch-throw.c +++ b/gdb/break-catch-throw.c @@ -63,15 +63,17 @@ static const struct exception_names exception_functions= [] =3D { "-probe-stap libstdcxx:catch", "__cxa_begin_catch" } }; =20 -/* The type of an exception catchpoint. */ +/* The type of an exception catchpoint. Unlike most catchpoints, this + one is implemented with code breakpoints, so it inherits struct + base_breakpoint, not struct catchpoint. */ =20 -struct exception_catchpoint : public catchpoint +struct exception_catchpoint : public base_breakpoint { exception_catchpoint (struct gdbarch *gdbarch, - bool temp, const char *cond_string, + bool temp, const char *cond_string_, enum exception_event_kind kind_, std::string &&except_rx) - : catchpoint (gdbarch, temp, cond_string), + : base_breakpoint (gdbarch, bp_catchpoint), kind (kind_), exception_rx (std::move (except_rx)), pattern (exception_rx.empty () @@ -79,6 +81,12 @@ struct exception_catchpoint : public catchpoint : new compiled_regex (exception_rx.c_str (), REG_NOSUB, _("invalid type-matching regexp"))) { + if (cond_string_ !=3D nullptr) + cond_string =3D make_unique_xstrdup (cond_string_); + disposition =3D temp ? disp_del : disp_donttouch; + + pspace =3D current_program_space; + re_set (); } =20 void re_set () override; @@ -375,8 +383,6 @@ handle_gnu_v3_exceptions (int tempflag, std::string &&e= xcept_rx, (new exception_catchpoint (gdbarch, tempflag, cond_string, ex_event, std::move (except_rx))); =20 - cp->re_set (); - install_breakpoint (0, std::move (cp), 1); }