From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id 99221385841C; Fri, 18 Nov 2022 15:56:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 99221385841C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1668786995; bh=Swe/trv1WxMViy5u8iBe2A2HaM0+YMTzmQXgRe1+ugI=; h=From:To:Subject:Date:From; b=olq28m5Wu7B5BJWrMsfE8CLsNvH7E7xrVWh9999+RlAynTFv8ugNtJrDAeqmWZJgp KI15xs7kAABvhk+9UyCpVPvA6V2Q7ptFk2cBSUcJ89vNt8h5yzcEQtxNpIT0tvfglv 20j4fnik07cldzXpJUwdm2vu2bNGzFZRnkyglBds= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Fix deletion of FinishBreakpoints X-Act-Checkin: binutils-gdb X-Git-Author: Johnson Sun X-Git-Refname: refs/heads/master X-Git-Oldrev: 9c48a8e6f43965b8d530159e5dbb2fc9d6083646 X-Git-Newrev: 6533cbeeb831224e2d2dd2a7bea54b22b798fa39 Message-Id: <20221118155635.99221385841C@sourceware.org> Date: Fri, 18 Nov 2022 15:56:34 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D6533cbeeb831= 224e2d2dd2a7bea54b22b798fa39 commit 6533cbeeb831224e2d2dd2a7bea54b22b798fa39 Author: Johnson Sun Date: Fri Oct 21 01:49:18 2022 +0800 Fix deletion of FinishBreakpoints =20 Currently, FinishBreakpoints are set at the return address of a frame b= ased on the `finish' command, and are meant to be temporary breakpoints. Howeve= r, they are not being cleaned up after use, as reported in PR python/18655. Thi= s was happening because the disposition of the breakpoint was not being set correctly. =20 This commit fixes this issue by correctly setting the disposition in the post-stop hook of the breakpoint. It also adds a test to ensure this fe= ature isn't regressed in the future. =20 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=3D18655 Diff: --- gdb/python/py-finishbreakpoint.c | 2 +- .../gdb.python/py-finish-breakpoint-deletion.c | 31 ++++++++++++++++ .../gdb.python/py-finish-breakpoint-deletion.exp | 41 ++++++++++++++++++= ++++ .../gdb.python/py-finish-breakpoint-deletion.py | 32 +++++++++++++++++ 4 files changed, 105 insertions(+), 1 deletion(-) diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpo= int.c index fdbff5cf6bf..526657580ce 100644 --- a/gdb/python/py-finishbreakpoint.c +++ b/gdb/python/py-finishbreakpoint.c @@ -145,7 +145,7 @@ bpfinishpy_post_stop_hook (struct gdbpy_breakpoint_obje= ct *bp_obj) { /* Can't delete it here, but it will be removed at the next stop. */ disable_breakpoint (bp_obj->bp); - gdb_assert (bp_obj->bp->disposition =3D=3D disp_del); + bp_obj->bp->disposition =3D disp_del_at_next_stop; } catch (const gdb_exception &except) { diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.c b/gdb= /testsuite/gdb.python/py-finish-breakpoint-deletion.c new file mode 100644 index 00000000000..b6e71513373 --- /dev/null +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.c @@ -0,0 +1,31 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2022 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . = */ + +static int +subroutine (int a) +{ + return a; +} + +int +main (void) +{ + int i; + for (i =3D 0; i < 5; i++) + subroutine (i); + return 0; +} diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.exp b/g= db/testsuite/gdb.python/py-finish-breakpoint-deletion.exp new file mode 100644 index 00000000000..cd882cee91d --- /dev/null +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.exp @@ -0,0 +1,41 @@ +# Copyright (C) 2022 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Check that FinishBreakpoints are deleted after use. + +load_lib gdb-python.exp + +standard_testfile + +if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} { + return -1 +} + +# Skip all tests if Python scripting is not enabled. +if { [skip_python_tests] } { continue } + +if ![runto_main] then { + return 0 +} + +# For remote host testing +set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py] + +gdb_test "python print(len(gdb.breakpoints()))" "1" "check default BP coun= t" +gdb_test "source $pyfile" ".*Python script imported.*" \ + "import python scripts" +gdb_test "python print(len(gdb.breakpoints()))" "2" "check modified BP cou= nt" +gdb_test "continue" "Breakpoint.*at.*" "run until FinishBreakpoint stops" +gdb_test "python print(len(gdb.breakpoints()))" "2" "check BP count" diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.py b/gd= b/testsuite/gdb.python/py-finish-breakpoint-deletion.py new file mode 100644 index 00000000000..ab05b0c35a3 --- /dev/null +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.py @@ -0,0 +1,32 @@ +# Copyright (C) 2022 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +class MyFinishBreakpoint(gdb.FinishBreakpoint): + def stop(self): + print("stopped at MyFinishBreakpoint") + return self.return_value =3D=3D 4 + + +class MyBreakpoint(gdb.Breakpoint): + def stop(self): + print("stopped at MyBreakpoint") + MyFinishBreakpoint() + return False + + +MyBreakpoint("subroutine", internal=3DTrue) + +print("Python script imported")