From: Johnson Sun <j3.soon777@gmail.com>
To: SimonMarchi <simark@simark.ca>, BrunoLarsen <blarsen@redhat.com>,
gdb-patches@sourceware.org
Cc: j3.soon777@gmail.com
Subject: [PATCH v4] [PR python/18655] Fix deletion of FinishBreakpoints
Date: Fri, 21 Oct 2022 01:49:18 +0800 [thread overview]
Message-ID: <20221020174917.192860-1-j3.soon777@gmail.com> (raw)
In-Reply-To: <20221020173411.190318-1-j3.soon777@gmail.com>
Currently, FinishBreakpoints are set at the return address of a frame based on
the `finish' command, and are meant to be temporary breakpoints. However, they
are not being cleaned up after use, as reported in PR python/18655. This was
happening because the disposition of the breakpoint was not being set
correctly.
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 feature
isn't regressed in the future.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=18655
---
gdb/python/py-finishbreakpoint.c | 2 +-
.../py-finish-breakpoint-deletion.c | 31 ++++++++++++++
.../py-finish-breakpoint-deletion.exp | 41 +++++++++++++++++++
.../py-finish-breakpoint-deletion.py | 32 +++++++++++++++
4 files changed, 105 insertions(+), 1 deletion(-)
create mode 100644 gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.c
create mode 100644 gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.exp
create mode 100644 gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.py
diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpoint.c
index c80096f6810..d8b1aff0e2b 100644
--- a/gdb/python/py-finishbreakpoint.c
+++ b/gdb/python/py-finishbreakpoint.c
@@ -145,7 +145,7 @@ bpfinishpy_post_stop_hook (struct gdbpy_breakpoint_object *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 == disp_del);
+ bp_obj->bp->disposition = 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 <http://www.gnu.org/licenses/>. */
+
+static int
+subroutine (int a)
+{
+ return a;
+}
+
+int
+main (void)
+{
+ int i;
+ for (i = 0; i < 5; i++)
+ subroutine (i);
+ return 0;
+}
diff --git a/gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.exp b/gdb/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 <http://www.gnu.org/licenses/>.
+
+# 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 count"
+gdb_test "source $pyfile" ".*Python script imported.*" \
+ "import python scripts"
+gdb_test "python print(len(gdb.breakpoints()))" "2" "check modified BP count"
+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/gdb/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 <http://www.gnu.org/licenses/>.
+
+
+class MyFinishBreakpoint(gdb.FinishBreakpoint):
+ def stop(self):
+ print("stopped at MyFinishBreakpoint")
+ return self.return_value == 4
+
+
+class MyBreakpoint(gdb.Breakpoint):
+ def stop(self):
+ print("stopped at MyBreakpoint")
+ MyFinishBreakpoint()
+ return False
+
+
+MyBreakpoint("subroutine", internal=True)
+
+print("Python script imported")
--
2.34.1
base-commit: c99b2113a478a075e8d8f7c3848a92f1ce73f847
next prev parent reply other threads:[~2022-10-20 17:49 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-20 17:24 [PATCH 0/3] [PR gdb/18655] Fix Python FinishBreakpoints not deleted bug Johnson Sun
2022-09-20 17:24 ` [PATCH 1/3] [gdb/testsuite] Add gdb.python/py-finish-breakpoint-deletion.exp for Bug 18655 Johnson Sun
2022-09-21 13:44 ` Bruno Larsen
2022-09-23 5:16 ` Johnson Sun
2022-09-20 17:24 ` [PATCH 2/3] [gdb/python] Fix " Johnson Sun
2022-09-21 14:02 ` Bruno Larsen
2022-09-20 17:24 ` [PATCH 3/3] [gdb/python] Replace gdbpy_should_stop with gdbpy_breakpoint_cond_says_stop Johnson Sun
2022-09-21 14:09 ` Bruno Larsen
2022-09-23 5:41 ` [PATCH v2] [PR python/18655] Fix deletion of FinishBreakpoints Johnson Sun
2022-09-23 8:32 ` Bruno Larsen
2022-09-23 20:16 ` Johnson Sun
2022-09-23 20:27 ` [PATCH v3] " Johnson Sun
2022-10-12 1:53 ` Simon Marchi
2022-10-20 17:34 ` Johnson Sun
2022-10-20 17:49 ` Johnson Sun [this message]
2022-11-18 12:16 ` [PING] [PATCH v4] " Johnson Sun
2022-11-18 15:56 ` Simon Marchi
2022-09-23 6:00 ` [PATCH v2] [gdb/python] Replace gdbpy_should_stop with gdbpy_breakpoint_cond_says_stop Johnson Sun
2022-10-20 18:24 ` [PING] " Johnson Sun
2022-11-18 12:14 ` [PING^2] " Johnson Sun
2022-11-25 15:10 ` [PING^3] " Johnson Sun
2022-12-04 16:45 ` [PING^4] " Johnson Sun
2022-12-12 21:44 ` [PING^5] " Johnson Sun
2022-12-13 2:34 ` Simon Marchi
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=20221020174917.192860-1-j3.soon777@gmail.com \
--to=j3.soon777@gmail.com \
--cc=blarsen@redhat.com \
--cc=gdb-patches@sourceware.org \
--cc=simark@simark.ca \
/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).