From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id A3CFD384D154 for ; Thu, 20 Oct 2022 17:49:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A3CFD384D154 Received: by mail-pl1-x632.google.com with SMTP id f23so20822plr.6 for ; Thu, 20 Oct 2022 10:49:46 -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:message-id:reply-to; bh=z/aXbf5VVq3uI46GMq1KMw+pUxuZLocKoUV8MOmjFjM=; b=28tWjQ/BuwGT3p3375XwK0HceG+bXkD5CrrPP9bYs5OoobZvlLUYFNPZ1DDEdCHxJc w17Qj1RchsYOWegf+woSnUTGAbAspUGH54H5NnZ7SwZ3dETCLTIh4XAPEmS/3obywSwI pz7PDg09HVI0b3txIFLO2TDUHI5ekFBBH+T9fsgqOx8zIRAzXpHtUKvj3rkLuIH1oguU QqCVTdolNr7a1Qs08HztT84DM4SV5hULQBTaO9h6uSXW1GCQxGuT5OWuVq7pkHegBtSh PFZaWFT8rYWlGcT+3x/xi4Hv81+D4cTqXecyVYty7YtsemB1ZfRQxRgf94CxzgKdZeQl DAow== X-Gm-Message-State: ACrzQf1aw8bzgEjBzLVPrTXfTnNU9VKYn4pG0EBGPkzWYxkip30c6RK+ Yr5ZFZ0FHZlGi/UET/sat20= X-Google-Smtp-Source: AMsMyM5dPiCRJM4jsyY937VLlNFHBlTUDRotXmBao6vYG5iK7q767bb0ueqrIw9l4Zgwtu20YAajLA== X-Received: by 2002:a17:902:e846:b0:185:2f:c52 with SMTP id t6-20020a170902e84600b00185002f0c52mr15113178plg.69.1666288185685; Thu, 20 Oct 2022 10:49:45 -0700 (PDT) Received: from ubuntu-22.. (intel10.cs.nthu.edu.tw. [140.114.89.60]) by smtp.gmail.com with ESMTPSA id ij4-20020a170902ab4400b0017f8edd3d8asm13092913plb.177.2022.10.20.10.49.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 10:49:45 -0700 (PDT) From: Johnson Sun To: SimonMarchi , BrunoLarsen , 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 Message-Id: <20221020174917.192860-1-j3.soon777@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221020173411.190318-1-j3.soon777@gmail.com> References: <20221020173411.190318-1-j3.soon777@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-List-Received-Date: Thu, 20 Oct 2022 17:49:49 -0000 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 . */ + +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 . + +# 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 . + + +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