From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1551) id 7EA6F3830890; Fri, 20 May 2022 19:42:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7EA6F3830890 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 structs breakpoint/base_breakpoint/catchpoint be abstract X-Act-Checkin: binutils-gdb X-Git-Author: Pedro Alves X-Git-Refname: refs/heads/master X-Git-Oldrev: 06615628294ceb515c045050a39cff4d66a20c1e X-Git-Newrev: 1c2cbcf1de2d3fcba119ff4ef01dc1b74923daeb Message-Id: <20220520194233.7EA6F3830890@sourceware.org> Date: Fri, 20 May 2022 19:42:33 +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:42:33 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D1c2cbcf1de2d= 3fcba119ff4ef01dc1b74923daeb commit 1c2cbcf1de2d3fcba119ff4ef01dc1b74923daeb Author: Pedro Alves Date: Fri May 6 20:09:04 2022 +0100 Make structs breakpoint/base_breakpoint/catchpoint be abstract =20 You should never instanciate these types directly. =20 Change-Id: I8086c74c415eadbd44924bb0ef20f34b5b97ee6f Diff: --- gdb/breakpoint.c | 15 +++++++++++++++ gdb/breakpoint.h | 6 +++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 385c92a6e7b..8f6794511e7 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -252,6 +252,21 @@ static const struct breakpoint_ops tracepoint_probe_br= eakpoint_ops =3D create_breakpoints_sal, }; =20 +/* Implementation of abstract dtors. These must exist to satisfy the + linker. */ + +breakpoint::~breakpoint () +{ +} + +base_breakpoint::~base_breakpoint () +{ +} + +catchpoint::~catchpoint () +{ +} + /* The structure to be used in regular breakpoints. */ struct ordinary_breakpoint : public base_breakpoint { diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index fb8651c55c3..b7e3b4dc6a1 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -631,7 +631,7 @@ struct breakpoint =20 DISABLE_COPY_AND_ASSIGN (breakpoint); =20 - virtual ~breakpoint () =3D default; + virtual ~breakpoint () =3D 0; =20 /* Allocate a location for this breakpoint. */ virtual struct bp_location *allocate_location (); @@ -862,6 +862,8 @@ struct base_breakpoint : public breakpoint { using breakpoint::breakpoint; =20 + ~base_breakpoint () override =3D 0; + void re_set () override; int insert_location (struct bp_location *) override; int remove_location (struct bp_location *, @@ -1023,6 +1025,8 @@ struct catchpoint : public base_breakpoint COND_STRING is not NULL, then store it in the breakpoint. */ catchpoint (struct gdbarch *gdbarch, bool temp, const char *cond_string); =20 + ~catchpoint () override =3D 0; + void re_set () override { /* For catchpoints, the default is to do nothing. */