Use gdbpy_ref in gdbpy_breakpoint_cond_says_stop

This changes gdbpy_breakpoint_cond_says_stop to use gdbpy_ref rather
than explicit reference management.

2017-01-10  Tom Tromey  <tom@tromey.com>

	* python/py-breakpoint.c (gdbpy_breakpoint_cond_says_stop): Use
	gdbpy_ref.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 49722e8001947b65447870271e53f9edec2fccbe..74e32bfd4a6fd600664390b141bc6377d7b6f0bf 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-10  Tom Tromey  <tom@tromey.com>
+
+       * python/py-breakpoint.c (gdbpy_breakpoint_cond_says_stop): Use
+       gdbpy_ref.
+
 2017-01-10  Tom Tromey  <tom@tromey.com>
 
        * python/py-arch.c (archpy_disassemble): Use gdbpy_ref.  Don't

diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c
index f3520cc8be50fe31496248873dca44898de9b6ea..f268b2bb44627943ff5f2f511fd3a1dea64b3118 100644 (file)
--- a/gdb/python/py-breakpoint.c
+++ b/gdb/python/py-breakpoint.c
@@ -805,12 +805,12 @@ gdbpy_breakpoint_cond_says_stop (const struct extension_language_defn *extlang,
 
   if (PyObject_HasAttrString (py_bp, stop_func))
     {
-      PyObject *result = PyObject_CallMethod (py_bp, stop_func, NULL);
+      gdbpy_ref result (PyObject_CallMethod (py_bp, stop_func, NULL));
 
       stop = 1;
-      if (result)
+      if (result != NULL)
        {
-         int evaluate = PyObject_IsTrue (result);
+         int evaluate = PyObject_IsTrue (result.get ());
 
          if (evaluate == -1)
            gdbpy_print_stack ();
@@ -819,8 +819,6 @@ gdbpy_breakpoint_cond_says_stop (const struct extension_language_defn *extlang,
             the Python breakpoint wants GDB to continue.  */
          if (! evaluate)
            stop = 0;
-
-         Py_DECREF (result);
        }
       else
        gdbpy_print_stack ();