Remove CPYCHECKER_RETURNS_BORROWED_REF

[binutils.git] / gdb / python / py-function.c

diff --git a/gdb/python/py-function.c b/gdb/python/py-function.c
index 0c3e6f2a466e70d096d112d802dc5e1807837204..c4612316df6f44d2552c2432d6c1a4ec4547360f 100644 (file)
--- a/gdb/python/py-function.c
+++ b/gdb/python/py-function.c
@@ -1,6 +1,6 @@
 /* Convenience functions implemented in Python.
 
 /* Convenience functions implemented in Python.
 

-   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2018 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
 
    This file is part of GDB.
 


@@ -20,7 +20,6 @@
 
 #include "defs.h"
 #include "value.h"
 
 #include "defs.h"
 #include "value.h"

-#include "exceptions.h"

 #include "python-internal.h"
 #include "charset.h"
 #include "gdbcmd.h"
 #include "python-internal.h"
 #include "charset.h"
 #include "gdbcmd.h"


@@ -28,8 +27,10 @@
 #include "completer.h"
 #include "expression.h"
 #include "language.h"
 #include "completer.h"
 #include "expression.h"
 #include "language.h"

+#include "py-ref.h"

 
 

-static PyTypeObject fnpy_object_type;
+extern PyTypeObject fnpy_object_type
+    CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("PyObject");

 
 \f
 
 
 \f
 


@@ -37,19 +38,19 @@ static PyObject *
 convert_values_to_python (int argc, struct value **argv)
 {
   int i;
 convert_values_to_python (int argc, struct value **argv)
 {
   int i;

-  PyObject *result = PyTuple_New (argc);
+  gdbpy_ref<> result (PyTuple_New (argc));
+
+  if (result == NULL)
+    return NULL;

 
   for (i = 0; i < argc; ++i)
     {
 
   for (i = 0; i < argc; ++i)
     {

-      PyObject *elt = value_to_value_object (argv[i]);
-      if (! elt)
-       {
-         Py_DECREF (result);
-         error (_("Could not convert value to Python object."));
-       }
-      PyTuple_SetItem (result, i, elt);
+      gdbpy_ref<> elt (value_to_value_object (argv[i]));
+      if (elt == NULL)
+       return NULL;
+      PyTuple_SetItem (result.get (), i, elt.release ());

     }
     }

-  return result;
+  return result.release ();

 }
 
 /* Call a Python function object's invoke method.  */
 }
 
 /* Call a Python function object's invoke method.  */


@@ -58,29 +59,32 @@ static struct value *
 fnpy_call (struct gdbarch *gdbarch, const struct language_defn *language,
           void *cookie, int argc, struct value **argv)
 {
 fnpy_call (struct gdbarch *gdbarch, const struct language_defn *language,
           void *cookie, int argc, struct value **argv)
 {

-  struct value *value = NULL;
-  PyObject *result, *callable, *args;
-  struct cleanup *cleanup;
-
-  cleanup = ensure_python_env (gdbarch, language);
-
-  args = convert_values_to_python (argc, argv);
-
-  callable = PyObject_GetAttrString ((PyObject *) cookie, "invoke");
-  if (! callable)
+  /* The gdbpy_enter object needs to be placed first, so that it's the last to
+     be destroyed.  */
+  gdbpy_enter enter_py (gdbarch, language);
+  struct value *value;
+  gdbpy_ref<> result;
+  gdbpy_ref<> args (convert_values_to_python (argc, argv));
+
+  /* convert_values_to_python can return NULL on error.  If we
+     encounter this, do not call the function, but allow the Python ->
+     error code conversion below to deal with the Python exception.
+     Note, that this is different if the function simply does not
+     have arguments.  */
+
+  if (args != NULL)

     {
     {

-      Py_DECREF (args);
-      error (_("No method named 'invoke' in object."));
-    }
+      gdbpy_ref<> callable (PyObject_GetAttrString ((PyObject *) cookie,
+                                                   "invoke"));
+      if (callable == NULL)
+       error (_("No method named 'invoke' in object."));

 
 

-  result = PyObject_Call (callable, args, NULL);
-  Py_DECREF (callable);
-  Py_DECREF (args);
+      result.reset (PyObject_Call (callable.get (), args.get (), NULL));
+    }

 
 

-  if (!result)
+  if (result == NULL)

     {
       PyObject *ptype, *pvalue, *ptraceback;
     {
       PyObject *ptype, *pvalue, *ptraceback;

-      char *msg;

 
       PyErr_Fetch (&ptype, &pvalue, &ptraceback);
 
 
       PyErr_Fetch (&ptype, &pvalue, &ptraceback);
 


@@ -88,8 +92,8 @@ fnpy_call (struct gdbarch *gdbarch, const struct language_defn *language,
         When fetching the error message we need to make our own copy,
         we no longer own ptype, pvalue after the call to PyErr_Restore.  */
 
         When fetching the error message we need to make our own copy,
         we no longer own ptype, pvalue after the call to PyErr_Restore.  */
 

-      msg = gdbpy_exception_to_string (ptype, pvalue);
-      make_cleanup (xfree, msg);
+      gdb::unique_xmalloc_ptr<char>
+       msg (gdbpy_exception_to_string (ptype, pvalue));

 
       if (msg == NULL)
        {
 
       if (msg == NULL)
        {


@@ -117,7 +121,7 @@ fnpy_call (struct gdbarch *gdbarch, const struct language_defn *language,
          gdbpy_print_stack ();
          if (msg != NULL && *msg != '\0')
            error (_("Error occurred in Python convenience function: %s"),
          gdbpy_print_stack ();
          if (msg != NULL && *msg != '\0')
            error (_("Error occurred in Python convenience function: %s"),

-                  msg);
+                  msg.get ());

          else
            error (_("Error occurred in Python convenience function."));
        }
          else
            error (_("Error occurred in Python convenience function."));
        }


@@ -126,21 +130,17 @@ fnpy_call (struct gdbarch *gdbarch, const struct language_defn *language,
          Py_XDECREF (ptype);
          Py_XDECREF (pvalue);
          Py_XDECREF (ptraceback);
          Py_XDECREF (ptype);
          Py_XDECREF (pvalue);
          Py_XDECREF (ptraceback);

-         error ("%s", msg);
+         error ("%s", msg.get ());

        }
     }
 
        }
     }
 

-  value = convert_value_from_python (result);
+  value = convert_value_from_python (result.get ());

   if (value == NULL)
     {
   if (value == NULL)
     {

-      Py_DECREF (result);

       gdbpy_print_stack ();
       error (_("Error while executing Python code."));
     }
 
       gdbpy_print_stack ();
       error (_("Error while executing Python code."));
     }
 

-  Py_DECREF (result);
-  do_cleanups (cleanup);
-

   return value;
 }
 
   return value;
 }
 


@@ -150,7 +150,8 @@ fnpy_call (struct gdbarch *gdbarch, const struct language_defn *language,
 static int
 fnpy_init (PyObject *self, PyObject *args, PyObject *kwds)
 {
 static int
 fnpy_init (PyObject *self, PyObject *args, PyObject *kwds)
 {

-  char *name, *docstring = NULL;
+  const char *name;
+  gdb::unique_xmalloc_ptr<char> docstring;

 
   if (! PyArg_ParseTuple (args, "s", &name))
     return -1;
 
   if (! PyArg_ParseTuple (args, "s", &name))
     return -1;


@@ -158,42 +159,45 @@ fnpy_init (PyObject *self, PyObject *args, PyObject *kwds)
 
   if (PyObject_HasAttrString (self, "__doc__"))
     {
 
   if (PyObject_HasAttrString (self, "__doc__"))
     {

-      PyObject *ds_obj = PyObject_GetAttrString (self, "__doc__");
-      if (ds_obj && gdbpy_is_string (ds_obj))
+      gdbpy_ref<> ds_obj (PyObject_GetAttrString (self, "__doc__"));
+      if (ds_obj != NULL)

        {
        {

-         docstring = python_string_to_host_string (ds_obj);
-         if (docstring == NULL)
+         if (gdbpy_is_string (ds_obj.get ()))

            {
            {

-             Py_DECREF (self);
-             return -1;
+             docstring = python_string_to_host_string (ds_obj.get ());
+             if (docstring == NULL)
+               {
+                 Py_DECREF (self);
+                 return -1;
+               }

            }
        }
     }
   if (! docstring)
            }
        }
     }
   if (! docstring)

-    docstring = xstrdup (_("This function is not documented."));
+    docstring.reset (xstrdup (_("This function is not documented.")));

 
 

-  add_internal_function (name, docstring, fnpy_call, self);
+  add_internal_function (name, docstring.release (), fnpy_call, self);

   return 0;
 }
 
 /* Initialize internal function support.  */
 
   return 0;
 }
 
 /* Initialize internal function support.  */
 

-void
+int

 gdbpy_initialize_functions (void)
 {
 gdbpy_initialize_functions (void)
 {

+  fnpy_object_type.tp_new = PyType_GenericNew;

   if (PyType_Ready (&fnpy_object_type) < 0)
   if (PyType_Ready (&fnpy_object_type) < 0)

-    return;
+    return -1;

 
 

-  Py_INCREF (&fnpy_object_type);
-  PyModule_AddObject (gdb_module, "Function", (PyObject *) &fnpy_object_type);
+  return gdb_pymodule_addobject (gdb_module, "Function",
+                                (PyObject *) &fnpy_object_type);

 }
 
 \f
 
 }
 
 \f
 

-static PyTypeObject fnpy_object_type =
+PyTypeObject fnpy_object_type =

 {
 {

-  PyObject_HEAD_INIT (NULL)
-  0,                             /*ob_size*/
+  PyVarObject_HEAD_INIT (NULL, 0)

   "gdb.Function",                /*tp_name*/
   sizeof (PyObject),             /*tp_basicsize*/
   0,                             /*tp_itemsize*/
   "gdb.Function",                /*tp_name*/
   sizeof (PyObject),             /*tp_basicsize*/
   0,                             /*tp_itemsize*/


@@ -230,5 +234,4 @@ static PyTypeObject fnpy_object_type =
   0,                             /* tp_dictoffset */
   fnpy_init,                     /* tp_init */
   0,                             /* tp_alloc */
   0,                             /* tp_dictoffset */
   fnpy_init,                     /* tp_init */
   0,                             /* tp_alloc */

-  PyType_GenericNew              /* tp_new */

 };
 };