From 12dfa12a3cfd4552c0cc4d7b271ab3e9c439589a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 24 Oct 2018 16:33:23 -0600 Subject: [PATCH] Return gdbpy_ref from gdb_py_object_from_*longest This changes gdb_py_object_from_longest and gdb_py_object_from_ulongest to return a gdbpy_ref rather than a PyObject*. gdb/ChangeLog 2018-11-04 Tom Tromey * python/python-internal.h (gdb_py_object_from_longest) (gdb_py_object_from_ulongest): Return gdbpy_ref. * python/py-value.c (valpy_int): Update. * python/py-utils.c (gdb_py_object_from_longest): Return gdbpy_ref. (gdb_py_object_from_ulongest): Likewise. * python/py-type.c (typy_get_alignof): Update. * python/py-linetable.c (ltpy_get_all_source_lines) (ltpy_entry_get_line, ltpy_entry_get_pc): Update. * python/py-block.c (blpy_get_start, blpy_get_end): Update. --- gdb/ChangeLog | 13 +++++++++++++ gdb/python/py-block.c | 4 ++-- gdb/python/py-linetable.c | 6 +++--- gdb/python/py-type.c | 2 +- gdb/python/py-utils.c | 22 +++++++++++----------- gdb/python/py-value.c | 4 ++-- gdb/python/python-internal.h | 4 ++-- 7 files changed, 34 insertions(+), 21 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bb4ea1fde4a..6389f4f811c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2018-11-04 Tom Tromey + + * python/python-internal.h (gdb_py_object_from_longest) + (gdb_py_object_from_ulongest): Return gdbpy_ref. + * python/py-value.c (valpy_int): Update. + * python/py-utils.c (gdb_py_object_from_longest): Return + gdbpy_ref. + (gdb_py_object_from_ulongest): Likewise. + * python/py-type.c (typy_get_alignof): Update. + * python/py-linetable.c (ltpy_get_all_source_lines) + (ltpy_entry_get_line, ltpy_entry_get_pc): Update. + * python/py-block.c (blpy_get_start, blpy_get_end): Update. + 2018-11-03 Philippe Waroquiers * ada-lang.c (_initialize_ada_language): Fix typo. diff --git a/gdb/python/py-block.c b/gdb/python/py-block.c index 5fc33f0f0fb..f5870c662bc 100644 --- a/gdb/python/py-block.c +++ b/gdb/python/py-block.c @@ -110,7 +110,7 @@ blpy_get_start (PyObject *self, void *closure) BLPY_REQUIRE_VALID (self, block); - return gdb_py_object_from_ulongest (BLOCK_START (block)); + return gdb_py_object_from_ulongest (BLOCK_START (block)).release (); } static PyObject * @@ -120,7 +120,7 @@ blpy_get_end (PyObject *self, void *closure) BLPY_REQUIRE_VALID (self, block); - return gdb_py_object_from_ulongest (BLOCK_END (block)); + return gdb_py_object_from_ulongest (BLOCK_END (block)).release (); } static PyObject * diff --git a/gdb/python/py-linetable.c b/gdb/python/py-linetable.c index c4e80d02a55..97c81aacf0c 100644 --- a/gdb/python/py-linetable.c +++ b/gdb/python/py-linetable.c @@ -244,7 +244,7 @@ ltpy_get_all_source_lines (PyObject *self, PyObject *args) include in the source set. */ if (item->line > 0) { - gdbpy_ref<> line (gdb_py_object_from_longest (item->line)); + gdbpy_ref<> line = gdb_py_object_from_longest (item->line); if (line == NULL) return NULL; @@ -327,7 +327,7 @@ ltpy_entry_get_line (PyObject *self, void *closure) { linetable_entry_object *obj = (linetable_entry_object *) self; - return gdb_py_object_from_longest (obj->line); + return gdb_py_object_from_longest (obj->line).release (); } /* Implementation of gdb.LineTableEntry.pc (self) -> Long. Returns a @@ -338,7 +338,7 @@ ltpy_entry_get_pc (PyObject *self, void *closure) { linetable_entry_object *obj = (linetable_entry_object *) self; - return gdb_py_object_from_longest (obj->pc); + return gdb_py_object_from_longest (obj->pc).release (); } /* LineTable iterator functions. */ diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c index 897ad9374af..afc76352353 100644 --- a/gdb/python/py-type.c +++ b/gdb/python/py-type.c @@ -755,7 +755,7 @@ typy_get_alignof (PyObject *self, void *closure) /* Ignore exceptions. */ - return gdb_py_object_from_ulongest (align); + return gdb_py_object_from_ulongest (align).release (); } static struct type * diff --git a/gdb/python/py-utils.c b/gdb/python/py-utils.c index 6ef0d7efd39..4dcac3daaf6 100644 --- a/gdb/python/py-utils.c +++ b/gdb/python/py-utils.c @@ -295,47 +295,47 @@ get_addr_from_python (PyObject *obj, CORE_ADDR *addr) /* Convert a LONGEST to the appropriate Python object -- either an integer object or a long object, depending on its value. */ -PyObject * +gdbpy_ref<> gdb_py_object_from_longest (LONGEST l) { #ifdef IS_PY3K if (sizeof (l) > sizeof (long)) - return PyLong_FromLongLong (l); - return PyLong_FromLong (l); + return gdbpy_ref<> (PyLong_FromLongLong (l)); + return gdbpy_ref<> (PyLong_FromLong (l)); #else #ifdef HAVE_LONG_LONG /* Defined by Python. */ /* If we have 'long long', and the value overflows a 'long', use a Python Long; otherwise use a Python Int. */ if (sizeof (l) > sizeof (long) && (l > PyInt_GetMax () || l < (- (LONGEST) PyInt_GetMax ()) - 1)) - return PyLong_FromLongLong (l); + return gdbpy_ref<> (PyLong_FromLongLong (l)); #endif - return PyInt_FromLong (l); + return gdbpy_ref<> (PyInt_FromLong (l)); #endif } /* Convert a ULONGEST to the appropriate Python object -- either an integer object or a long object, depending on its value. */ -PyObject * +gdbpy_ref<> gdb_py_object_from_ulongest (ULONGEST l) { #ifdef IS_PY3K if (sizeof (l) > sizeof (unsigned long)) - return PyLong_FromUnsignedLongLong (l); - return PyLong_FromUnsignedLong (l); + return gdbpy_ref<> (PyLong_FromUnsignedLongLong (l)); + return gdbpy_ref<> (PyLong_FromUnsignedLong (l)); #else #ifdef HAVE_LONG_LONG /* Defined by Python. */ /* If we have 'long long', and the value overflows a 'long', use a Python Long; otherwise use a Python Int. */ if (sizeof (l) > sizeof (unsigned long) && l > PyInt_GetMax ()) - return PyLong_FromUnsignedLongLong (l); + return gdbpy_ref<> (PyLong_FromUnsignedLongLong (l)); #endif if (l > PyInt_GetMax ()) - return PyLong_FromUnsignedLong (l); + return gdbpy_ref<> (PyLong_FromUnsignedLong (l)); - return PyInt_FromLong (l); + return gdbpy_ref<> (PyInt_FromLong (l)); #endif } diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index 26e91ff2b27..fe2adcc19c3 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -1516,9 +1516,9 @@ valpy_int (PyObject *self) END_CATCH if (TYPE_UNSIGNED (type)) - return gdb_py_object_from_ulongest (l); + return gdb_py_object_from_ulongest (l).release (); else - return gdb_py_object_from_longest (l); + return gdb_py_object_from_longest (l).release (); } #endif diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index 1812abb5b7b..5f15a33d5e7 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -705,8 +705,8 @@ extern void gdbpy_convert_exception (struct gdb_exception) int get_addr_from_python (PyObject *obj, CORE_ADDR *addr) CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION; -PyObject *gdb_py_object_from_longest (LONGEST l); -PyObject *gdb_py_object_from_ulongest (ULONGEST l); +gdbpy_ref<> gdb_py_object_from_longest (LONGEST l); +gdbpy_ref<> gdb_py_object_from_ulongest (ULONGEST l); int gdb_py_int_as_long (PyObject *, long *); PyObject *gdb_py_generic_dict (PyObject *self, void *closure); -- 2.30.2