From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from AUS01-ME3-obe.outbound.protection.outlook.com (mail-me3aus01olkn2156.outbound.protection.outlook.com [40.92.63.156]) by sourceware.org (Postfix) with ESMTPS id 1241A3858D1E for ; Sun, 17 Apr 2022 07:18:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1241A3858D1E ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VKWYWCVOrxDeWntpkw2bHlAlAXzt4e+XUWJ9CNhnA6LNgjewj4VgfOcblaaITFaqzTqAvApn90eZyk6K5MXMg+7uQLsZYXH68AbV5DDW8ILfYNnITKzkbnT8K8d++Aebf31l9qRpFSVwr4hVeBukV67zZ3JATgOO+rxURPbnmMJHE0Nt8l9Nct7Tmr0zPDXowqn/x3P6ruhcTKXon678B1YL5rSx9F1BbucyPdRNgzmTMWy7yPBCEfFj4JeadTaO4Z8negTP3fJE0W5QEpCYGVM7YrCqmomNm1uXkQ6TWBMvatkPpWD4fTYYxGr91nqt1NMMnbTcCZsHEN83KhsGpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=g/LEbvQZkshkGzBBH4O7wcJnZ+8hHvHvOCdc1NO4u84=; b=eUdtDltG8oZPCocF4h4ceRddVNunhV+Bq43dT6lKHheJRm8mnuKpGqfQik1FgPIvPNpQCX4icHa65noT6I/WQ2fn2060ua7P/PIdUy06XEFnsIJnN3+KtXiQLbRqBpbSdAcS4xeeFKAjTi89V2zzBPW80beN72CaRsxz6UqsugnWEGstmt1htnKqvrL5H7+WcfxnY1Gw3sWr7m7FULoekFxJyqOHwFbQKZ0pOrMb2s/AXYAXFPDFNlYldQ5tpZzd1Imt1ANlQOF4ZldRCLI/xjKEcOyi5dSpZDS/eZ5RvPv3s8PK9a8Bu3CLmw9jCWvB8P859Xz4RPZAyejISxp2RQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from MEAP282MB0293.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:71::10) by ME4P282MB0903.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:95::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.18; Sun, 17 Apr 2022 07:18:53 +0000 Received: from MEAP282MB0293.AUSP282.PROD.OUTLOOK.COM ([fe80::5804:c2bb:bc94:3cec]) by MEAP282MB0293.AUSP282.PROD.OUTLOOK.COM ([fe80::5804:c2bb:bc94:3cec%6]) with mapi id 15.20.5164.025; Sun, 17 Apr 2022 07:18:53 +0000 From: Enze Li To: tom@tromey.com Cc: gdb-patches@sourceware.org Subject: [PATCH RESEND v3] gdb: fix using clear command to delete non-user breakpoints(PR cli/7161) Date: Sun, 17 Apr 2022 15:18:40 +0800 Message-ID: X-Mailer: git-send-email 2.35.1 In-Reply-To: <87sfqez4de.fsf@tromey.com> References: <87sfqez4de.fsf@tromey.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [OakC9DY1+syL9ZuRm0sIcARjopkxr726] X-ClientProxiedBy: HK2PR03CA0064.apcprd03.prod.outlook.com (2603:1096:202:17::34) To MEAP282MB0293.AUSP282.PROD.OUTLOOK.COM (2603:10c6:220:71::10) X-Microsoft-Original-Message-ID: <20220417071840.24470-1-lienze2010@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18dbd50d-994d-4a10-a09c-08da2042872b X-MS-TrafficTypeDiagnostic: ME4P282MB0903:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gUPZGxreMNPHgt81N9ortVEPoDv6a5Y02MG9ckJal04GqZhYXf9sOM47oqs7KKPdgR1vXjgLQHmjZ7wF8jDuBuom/Vs7lm5iQBgJorzXL/JkoRvXocK8KqysGLEJmHIITEQ02DSnOh2lFMUxWGlDoItdAC8O1vtlF0OyppBdEwKx6x8CJlF3a8RmeDE3lK7DQPDBb6z85vQA45ILKtFdSF/wO/Vnf7lT5jKTtgWgF8T8J7m2d6kdEXTgU8GT8v4UxshasGm9BEEDaMpeXjvPqJr+wbI//HeZuqJet97TnGaQG6zY2XaF0TRRAG09TFgNb8ULbqjw9llpINZBC/bmvOiN4F/UFMm58B50ZZ8zzFTSctYQl9i64LQDddAoW4+byBhKRlADAFOlzk5l6ijBpr9lL3eqD7Y5RTkYmnRVKx9JRmELJhQa3n9TLBHuz8uvcAV78/jir9fpPMAvkRq7rInXvVNyEtxjgTPPI/T0PIw3IAgtJXsl0gRADIsdhTRh7fLWdOY9n0ymgFip8JpjgjEbecQE3fVgG2LP2N433AzVb1490k+amQ06zmh7Bk6cQN9zAXgMkfM08HW2S3YnA+fQzbM+CBsFKR54WdQCXeqZgtdd38WnlhHx4nKqDFYH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WG9XtoRDKewZjvqTmjphIOWrOxv/XNdZtNTH+gAgB0Vu+TLaHiL/x+EOY5Vh?= =?us-ascii?Q?v+j0Ew7PoIGj2tvbmiNX1cay2BCWcplP4qWLc2cP/v47IdgSg6akG4rWAis1?= =?us-ascii?Q?5SMlYEXem7/JH/DvRtHYMtvSJ+vDhKw3Luy52z11rzAneXck/CPXcAQE82j2?= =?us-ascii?Q?5pD//yLh+uHQLaj3ysUwGS6mRGSQzys7632mJ1cWbfolwyyq+tvhOju9+uo2?= =?us-ascii?Q?pDJVhxXmqMBaQR7AT6COVloFD7u0PC8PTwHolMI8+XHjcKVZAMl8/nomNaXT?= =?us-ascii?Q?crGtgig3gx6tNxAQLNe2lC/F/K9gBjZRo5m9khrJI1RNOr4bmETdLzy/oXj/?= =?us-ascii?Q?nKZHzYqX8fjFdiIBOISQPtgu1WEzWz1gcFO2gfXY/W3wvh90fkA39876w+Aw?= =?us-ascii?Q?/Q3LSMYq20Nvf7BV5/LGzA/x2Spcxy80Z8kiw5T5jH/oEF65AfWBq+5XzyJX?= =?us-ascii?Q?qHkXRuTcKbDCfneouU7vzEYIemouDpre5+YVrz0pKcCGGyasJTLzXNemf1am?= =?us-ascii?Q?Yj/ZZe8meNT3wJZHi72STdNhRlCgkWaKpDbWZPXg7eCKQTaMtLAVy/HEW9Ru?= =?us-ascii?Q?5JuZqqh3wW6y2qQ4229PqdT1f06dbN/aA92GaKhHL8Fnp1X8anrXJSkXbJmy?= =?us-ascii?Q?YczpOLJic8bw+B9HrZcglCEJcOLg5K5pt680IBJKnCzy+9baNfbv2jmHwieD?= =?us-ascii?Q?0BoYoI78CLT5b8aeOa4F45kZ3jCW7wf5QLCzX3D5H7J5jKeddt01lNZP3fj6?= =?us-ascii?Q?KpqcMjG5O73yOpNmv/8Xt2tR6YflLtoFAfycIYmjWvEv3aoOEAPGComgrF42?= =?us-ascii?Q?tr2iLI9IDeS5lEqrFQ4MHqobtw2gAJW5f0hyk4e7156skRIjls5o/qvG4cQx?= =?us-ascii?Q?vbaF9q3azHLlRK2eFqPLQYV0fnNM/KBKIB6pPIgGl838EQO5hvxVNq9gYxV5?= =?us-ascii?Q?aK5Z8k1qYI3+VmqCjKcI++xC2R7UDXw6D0feVQFDBhrarHbh5Jr6m2SvFe89?= =?us-ascii?Q?idR0w9MvCG8Hn7KUnagGlfEgCjOPjRxeabDmAMzTR667lfh/rtGk/lVHiR3q?= =?us-ascii?Q?l1is+1FOdgK+3dpAEw4EY4G8nRb8RO58WBtLHH5HR39mtp2V59Cim76teQfQ?= =?us-ascii?Q?w5cRfIdl4K4Cscb+bwaqRNO4Xnr4WPEhF7ZEu4qNQMw9Jz7oVkLuJ0mKgrSo?= =?us-ascii?Q?RtxtoSHcylY70J6FvQxyVnm4oxLnw3gzl264+AVXcPcs/M3EYgngS0Xt0zMJ?= =?us-ascii?Q?UuNK3WVb5Q08ps+QyHqwnLuoNi4xy9yxefqYHFplBmkC2h5wp3jaunY/QC1K?= =?us-ascii?Q?KPS93fxmMKSKfrj28JqR5uvGdCsaH2Db1YaW8SB7BNOK5HlwwQoy3YjJvLnU?= =?us-ascii?Q?45aF65Wm8Gi4DFvjGMlbPoUddQhrk0fCfScjSNYK8JtkC4qQ4wJrytCgpd0k?= =?us-ascii?Q?YMqo2dGJJiY=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-746f3.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 18dbd50d-994d-4a10-a09c-08da2042872b X-MS-Exchange-CrossTenant-AuthSource: MEAP282MB0293.AUSP282.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2022 07:18:53.7184 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: ME4P282MB0903 X-Spam-Status: No, score=-11.2 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, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Sun, 17 Apr 2022 07:18:59 -0000 The clear command shouldn't delete momentary and internal breakpoints, nor internal breakpoints created via Python's gdb.Breakpoint. This patch fixes this issue and adds a testcase. Regression tested on x86_64 openSUSE Tumbleweed(VERSION_ID="20220413"). Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=7161 --- gdb/breakpoint.c | 3 +- gdb/testsuite/gdb.base/clear_non_user_bp.exp | 64 ++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.base/clear_non_user_bp.exp diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 1a227e5d120..ff27174b91f 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -10921,7 +10921,8 @@ clear_command (const char *arg, int from_tty) { int match = 0; /* Are we going to delete b? */ - if (b->type != bp_none && !is_watchpoint (b)) + if (b->type != bp_none && !is_watchpoint (b) + && user_breakpoint_p (b)) { for (bp_location *loc : b->locations ()) { diff --git a/gdb/testsuite/gdb.base/clear_non_user_bp.exp b/gdb/testsuite/gdb.base/clear_non_user_bp.exp new file mode 100644 index 00000000000..3ac037e8a43 --- /dev/null +++ b/gdb/testsuite/gdb.base/clear_non_user_bp.exp @@ -0,0 +1,64 @@ +# 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 . + +# Regression test for PR gdb/7161. Test that GDB cannot delete non-user +# breakpoints with clear command. + +proc get_maint_info_bp { var } { + global expect_out + global gdb_prompt + + gdb_test_multiple "maint info break -1" "find address of internal bp $var" { + -re ".*(0x\[0-9a-f\]+).*$gdb_prompt $" { + return $expect_out(1,string) + } + timeout { + perror "couldn't find address of $var" + return "" + } + } + return "" +} + +standard_testfile .c + +# This testcase just needs a "Hello world" source file, reuse +# gdb.base/main.c instead of adding a new one. +if { [gdb_compile "${srcdir}/${subdir}/main.c" "${binfile}" executable {debug}] != "" } { + untested "failed to compile" + return -1 +} + +# Start with a fresh gdb. +clean_restart ${binfile} + +if ![runto_main] then { + return 0 +} + +gdb_test "break main.c:21" \ + ".*Breakpoint.* at .*" \ + "set breakpoint" + +set bp_addr [get_maint_info_bp "-1"] + +gdb_test "maint info break -1" \ + "-1.*shlib events.*keep y.*$bp_addr.*" \ + "maint info breakpoint -1 error" + +gdb_test "clear *$bp_addr" \ + "No breakpoint at \\*$bp_addr." \ + "clear internal breakpoint error" + -- 2.35.1