Re: [PATCH v2] gdb: fix using clear command to delete non-user breakpoints(PR cli/7161)

[Enze Li <lienze2010@hotmail.com>]

Kindly Ping.

The previous version is here,
https://sourceware.org/pipermail/gdb-patches/2022-March/186607.html

Thanks,
Enze

On Thu, 2022-03-17 at 22:24 +0800, Enze Li via Gdb-patches wrote:
> 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.
> 
> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=7161
> ---
>  gdb/breakpoint.c                  |  3 +-
>  gdb/testsuite/gdb.base/pr7161.c   | 25 +++++++++++++
>  gdb/testsuite/gdb.base/pr7161.exp | 59
> +++++++++++++++++++++++++++++++
>  3 files changed, 86 insertions(+), 1 deletion(-)
>  create mode 100644 gdb/testsuite/gdb.base/pr7161.c
>  create mode 100644 gdb/testsuite/gdb.base/pr7161.exp
> 
> diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
> index a3cfeea6989..ee1ce793593 100644
> --- a/gdb/breakpoint.c
> +++ b/gdb/breakpoint.c
> @@ -10979,7 +10979,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/pr7161.c
> b/gdb/testsuite/gdb.base/pr7161.c
> new file mode 100644
> index 00000000000..b5a3a8ccb30
> --- /dev/null
> +++ b/gdb/testsuite/gdb.base/pr7161.c
> @@ -0,0 +1,25 @@
> +/* This test 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/>.  */
> +
> +#include <stdio.h>
> +
> +int
> +main ()
> +{
> +  printf("Hello,world!\n"); /* break here */
> +  return 0;
> +}
> diff --git a/gdb/testsuite/gdb.base/pr7161.exp
> b/gdb/testsuite/gdb.base/pr7161.exp
> new file mode 100644
> index 00000000000..533e61d1795
> --- /dev/null
> +++ b/gdb/testsuite/gdb.base/pr7161.exp
> @@ -0,0 +1,59 @@
> +# 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/>.
> +
> +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
> +
> +if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${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 [gdb_get_line_number "break here"]" \
> +       ".*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"
> +