Change Python code to use new_reference

This changes a few spots in the Python code to use new_reference
rather than the manual incref+constructor that was previously being
done.

ChangeLog
2018-04-30  Tom Tromey  <tom@tromey.com>

	* varobj.c (varobj_set_visualizer): Use new_reference.
	* python/python.c (gdbpy_decode_line): Use new_reference.
	* python/py-cmd.c (cmdpy_function, cmdpy_completer_helper): Use
	new_reference.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dbac3e8c9ee6c67cd8efde07eb45a89fcd47520c..58640da0dccce9dc0b6f5e99ef1854bb2b4bc133 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2018-04-30  Tom Tromey  <tom@tromey.com>
+
+       * varobj.c (varobj_set_visualizer): Use new_reference.
+       * python/python.c (gdbpy_decode_line): Use new_reference.
+       * python/py-cmd.c (cmdpy_function, cmdpy_completer_helper): Use
+       new_reference.
+
 2018-04-30  Tom Tromey  <tom@tromey.com>
 
        * varobj.c (install_new_value): Use new_reference.

diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c
index bff445f62f2c180d4577e6c23b3b733048a38a01..27c4689413a61fb64e7a0826e7d87480c9f224aa 100644 (file)
--- a/gdb/python/py-cmd.c
+++ b/gdb/python/py-cmd.c
@@ -138,8 +138,8 @@ cmdpy_function (struct cmd_list_element *command,
       error (_("Could not convert arguments to Python string."));
     }
 
-  gdbpy_ref<> ttyobj (from_tty ? Py_True : Py_False);
-  Py_INCREF (ttyobj.get ());
+  gdbpy_ref<> ttyobj
+    = gdbpy_ref<>::new_reference (from_tty ? Py_True : Py_False);
   gdbpy_ref<> result (PyObject_CallMethodObjArgs ((PyObject *) obj, invoke_cst,
                                                  argobj.get (), ttyobj.get (),
                                                  NULL));
@@ -246,8 +246,7 @@ cmdpy_completer_helper (struct cmd_list_element *command,
   if (word == NULL)
     {
       /* "brkchars" phase.  */
-      wordobj.reset (Py_None);
-      Py_INCREF (Py_None);
+      wordobj = gdbpy_ref<>::new_reference (Py_None);
     }
   else
     {

diff --git a/gdb/python/python.c b/gdb/python/python.c
index 9eae8a1aef2dfce9763278d3512b509b9a874b74..0dd7d6a6adad1ede603eda3835eb6f39fe0006d7 100644 (file)
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -876,10 +876,7 @@ gdbpy_decode_line (PyObject *self, PyObject *args)
        }
     }
   else
-    {
-      result.reset (Py_None);
-      Py_INCREF (Py_None);
-    }
+    result = gdbpy_ref<>::new_reference (Py_None);
 
   gdbpy_ref<> return_result (PyTuple_New (2));
   if (return_result == NULL)
@@ -892,10 +889,7 @@ gdbpy_decode_line (PyObject *self, PyObject *args)
        return NULL;
     }
   else
-    {
-      unparsed.reset (Py_None);
-      Py_INCREF (Py_None);
-    }
+    unparsed = gdbpy_ref<>::new_reference (Py_None);
 
   PyTuple_SetItem (return_result.get (), 0, unparsed.release ());
   PyTuple_SetItem (return_result.get (), 1, result.release ());

diff --git a/gdb/varobj.c b/gdb/varobj.c
index 4656bfa6b9e48d288c6bf886a6b7505d59e55a37..a0df485ae916daf4d163b1614df50398d8d8b643 100644 (file)
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -1455,9 +1455,8 @@ varobj_set_visualizer (struct varobj *var, const char *visualizer)
   gdbpy_enter_varobj enter_py (var);
 
   mainmod = PyImport_AddModule ("__main__");
-  gdbpy_ref<> globals (PyModule_GetDict (mainmod));
-  Py_INCREF (globals.get ());
-
+  gdbpy_ref<> globals
+    = gdbpy_ref<>::new_reference (PyModule_GetDict (mainmod));
   gdbpy_ref<> constructor (PyRun_String (visualizer, Py_eval_input,
                                         globals.get (), globals.get ()));