From 43684a7b844bce64735940b55b667f7086fa3d44 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 19 May 2016 15:52:52 -0600 Subject: [PATCH] use user_breakpoint_p in python code I noticed that bppy_get_visibility and gdbpy_breakpoint_created implemented their own visibility checks, but subtly different from user_breakpoint_p. I think the latter is more correct, and so changed the Python code to use it. I suspect there isn't a decent way to test this, so no new test. Built and regtested on x86-64 Fedora 23. 2016-07-13 Tom Tromey * python/py-breakpoint.c (bppy_get_visibility) (gdbpy_breakpoint_created): Use user_breakpoint_p. --- gdb/ChangeLog | 5 +++++ gdb/python/py-breakpoint.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 65adae17bc8..437f4a5ca76 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-07-13 Tom Tromey + + * python/py-breakpoint.c (bppy_get_visibility) + (gdbpy_breakpoint_created): Use user_breakpoint_p. + 2016-07-13 Tom Tromey PR cli/18053: diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index 5918bcc8f05..513a02d08f2 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -540,10 +540,10 @@ bppy_get_visibility (PyObject *self, void *closure) BPPY_REQUIRE_VALID (self_bp); - if (self_bp->bp->number < 0) - Py_RETURN_FALSE; + if (user_breakpoint_p (self_bp->bp)) + Py_RETURN_TRUE; - Py_RETURN_TRUE; + Py_RETURN_FALSE; } /* Python function to determine if the breakpoint is a temporary @@ -863,7 +863,7 @@ gdbpy_breakpoint_created (struct breakpoint *bp) gdbpy_breakpoint_object *newbp; PyGILState_STATE state; - if (bp->number < 0 && bppy_pending_object == NULL) + if (!user_breakpoint_p (bp) && bppy_pending_object == NULL) return; if (bp->type != bp_breakpoint -- 2.30.2