From patchwork Fri Sep 23 20:27:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johnson Sun X-Patchwork-Id: 57982 X-Patchwork-Delegate: simon.marchi@polymtl.ca Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DA1353857C49 for ; Fri, 23 Sep 2022 20:29:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DA1353857C49 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1663964944; bh=R1RAKcNOeXFirGmT9tvy5K15Ve5SdFIv7E9qViEKpJM=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=EQ+x278GhYm2+eF7JM76D4Qft+bZChyz81ZlX4om4LnSv389vvPlGoLhC9LgpF31c Y5lqY/ukxWxdtx38UGYlIfKe9nt4vW7yd95ejgEie2OMZaec/btML11dlXC3fR20OQ UXoVA1NYNFwppFN1PmI8dK2yhozvnb9InrmJnRlQ= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id 719AB3858C54 for ; Fri, 23 Sep 2022 20:28:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 719AB3858C54 Received: by mail-wr1-x42a.google.com with SMTP id n10so1569995wrw.12 for ; Fri, 23 Sep 2022 13:28:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=R1RAKcNOeXFirGmT9tvy5K15Ve5SdFIv7E9qViEKpJM=; b=Igm7Jdqjz0u2fAQzs1EP/gk3IZT5HyRCdv0GE1OcUqc/Jll5gnsjxo+0y8FQTQFu5g n2zGUqoTHKhlxHthd2mVNohA01AjROrfEQmneArRXuD+GoS+cOfz3VoYfN/ybjKn/GQ7 8gtimVogDhKyWoA3kcTolCkx3b/iLIej1VH1uFMxsPSn2bkwDCqRSUnTqjXCrcmGlZqo h/IRKt0KoCbo6stbR3C4pef8K88B3X4T2JQ+dO0wQHb/42879R/dTT58dnPqU4ObBmeh S3DZAAbs81mbS7t66BjwcklqGG8wm82DSCKyNCFuQT17PvJaxHPJdPQhQl+X/gqFqNHj bYdQ== X-Gm-Message-State: ACrzQf1pxWErCUDrqYU74+qM2hYX1WrJzln/KjIhL9AWDeh/x0xE2Ral Eeh6qSi77KrfwGvbaha+JjK1nWVkD5VsVA== X-Google-Smtp-Source: AMsMyM5Q6NrSzVXtlnyIOFj0IdeEMh8xaVTel684mkMmsaZhOkuO5AyLGVxUQNwzPU9y2wdbsqR8ag== X-Received: by 2002:a5d:4bc3:0:b0:22a:4b7a:6f60 with SMTP id l3-20020a5d4bc3000000b0022a4b7a6f60mr6240040wrt.549.1663964919191; Fri, 23 Sep 2022 13:28:39 -0700 (PDT) Received: from ubuntu-22.. (intel10.cs.nthu.edu.tw. [140.114.89.60]) by smtp.gmail.com with ESMTPSA id fc17-20020a05600c525100b003b435c41103sm1418413wmb.0.2022.09.23.13.28.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Sep 2022 13:28:38 -0700 (PDT) To: BrunoLarsen , gdb-patches@sourceware.org Subject: [PATCH v3] [PR python/18655] Fix deletion of FinishBreakpoints Date: Sat, 24 Sep 2022 04:27:48 +0800 Message-Id: <20220923202747.1617754-1-j3.soon777@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220923054123.78393-1-j3.soon777@gmail.com> References: <20220923054123.78393-1-j3.soon777@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Johnson Sun via Gdb-patches From: Johnson Sun Reply-To: Johnson Sun Cc: j3.soon777@gmail.com Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" 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 | 43 +++++++++++++++++++ .../py-finish-breakpoint-deletion.py | 33 ++++++++++++++ 4 files changed, 108 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..f09f58861e8 --- /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 . */ + +int +subroutine (int a) +{ + return a; +} + +int +main () +{ + 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..25919900a59 --- /dev/null +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.exp @@ -0,0 +1,43 @@ +# 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 . + +# This file is part of the GDB testsuite. It checks FinishBreakpoints +# are deleted after used. + +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 +} + +# +# Check FinishBreakpoints are deleted after used +# + +gdb_test "python print (len(gdb.breakpoints()))" "1" "check default BP count" +gdb_test "source ${srcdir}/${subdir}/${testfile}.py" ".*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..f207d0bd2bf --- /dev/null +++ b/gdb/testsuite/gdb.python/py-finish-breakpoint-deletion.py @@ -0,0 +1,33 @@ +# 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 . + +# This file is part of the GDB testsuite. It checks FinishBreakpoints +# are deleted after used. + + +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")