From 961815297c7bbb260abbbe4960af70da95b7e765 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 19 Sep 2013 14:45:33 +0000 Subject: [PATCH] Fix regressions caused by thread-specific breakpoint deletion. The recent change to make GDB auto-delete thread-specific breakpoints when the corresponding thread is deleted (https://sourceware.org/ml/gdb-patches/2013-09/msg00038.html) caused gdb.base/nextoverexit.exp to regress. Breakpoint 1, main () at .../gdb/testsuite/gdb.base/nextoverexit.c:21 21 exit (0); (gdb) next [Inferior 1 (process 25208) exited normally] Thread-specific breakpoint -5 deleted - thread 1 is gone. Thread-specific breakpoint -6 deleted - thread 1 is gone. Thread-specific breakpoint -7 deleted - thread 1 is gone. Thread-specific breakpoint 0 deleted - thread 1 is gone. (gdb) FAIL: gdb.base/nextoverexit.exp: next over exit (the program exited) We shouldn't be seeing this for internal or momentary breakpoints. In fact, we shouldn't even be trying to delete them, as whatever created them will take care or it, and therefore it's dangerous to delete them behind the creator's back. I thought it'd still be good to tag thread-specific internal/momentary breakpoints such that we'll no longer try to keep them insert in the target, as they'll cause stops and thread hops in other threads, so I tried disabling them instead. That caused a problem when following a child fork, and detaching from the parent, as we try to reset the step-resume etc. breakpoints to the new child's thread (breakpoint_re_set_thread), after the parent thread is already gone (and the breakpoints are marked disabled). I fixed that by re-enabling internal/momentary breakpoints there, but, that didn't feel super safe either (maybe we'd need a new flag in struct breakpoint instead, to tag the thread-specific breakpoint as "not to be inserted"). It felt like I was heading down a design rat hole, and, other things will usually delete internal/momentary breakpoints soon enough, so I left that little optimization for some other day. So, internal/momentary breakpoints are no longer deleted/disabled at all, and we end up with a one-liner fix. Tested on x86_64 Fedora 17. gdb/ 2013-09-19 Pedro Alves * breakpoint.c (remove_threaded_breakpoints): Skip non-user breakpoints. --- gdb/ChangeLog | 5 +++++ gdb/breakpoint.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 738d757b1f1..a71cc5ce9b7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2013-09-19 Pedro Alves + + * breakpoint.c (remove_threaded_breakpoints): Skip non-user + breakpoints. + 2013-09-19 Pedro Alves Thomas Schwinge Yue Lu diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 734dfd6c114..c132e24aa6c 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -2938,7 +2938,7 @@ remove_threaded_breakpoints (struct thread_info *tp, int silent) ALL_BREAKPOINTS_SAFE (b, b_tmp) { - if (b->thread == tp->num) + if (b->thread == tp->num && user_breakpoint_p (b)) { b->disposition = disp_del_at_next_stop; -- 2.30.2