From patchwork Mon Nov 7 05:47:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 17250 Received: (qmail 79573 invoked by alias); 7 Nov 2016 05:48:41 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 78637 invoked by uid 89); 7 Nov 2016 05:48:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=H*r:4.86_1, H*Ad:U*tom, H*r:cmgw2, Hx-spam-relays-external:10.0.90.83 X-HELO: gproxy7-pub.mail.unifiedlayer.com Received: from gproxy7-pub.mail.unifiedlayer.com (HELO gproxy7-pub.mail.unifiedlayer.com) (70.40.196.235) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with SMTP; Mon, 07 Nov 2016 05:47:49 +0000 Received: (qmail 29833 invoked by uid 0); 7 Nov 2016 05:47:46 -0000 Received: from unknown (HELO cmgw2) (10.0.90.83) by gproxy7.mail.unifiedlayer.com with SMTP; 7 Nov 2016 05:47:46 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw2 with id 4tni1u0042f2jeq01tnlvs; Sun, 06 Nov 2016 22:47:45 -0700 X-Authority-Analysis: v=2.1 cv=PIacp5aC c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=L24OOQBejmoA:10 a=zstS-IiYAAAA:8 a=C9uaaMd6PD9dCA5QRqsA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 174-16-143-211.hlrn.qwest.net ([174.16.143.211]:47918 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1c3cmV-0008A3-I7; Sun, 06 Nov 2016 22:47:43 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 13/14] Use gdbpy_reference in py-value.c Date: Sun, 6 Nov 2016 22:47:35 -0700 Message-Id: <1478497656-11832-14-git-send-email-tom@tromey.com> In-Reply-To: <1478497656-11832-1-git-send-email-tom@tromey.com> References: <1478497656-11832-1-git-send-email-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1c3cmV-0008A3-I7 X-Source-Sender: 174-16-143-211.hlrn.qwest.net (bapiya.Home) [174.16.143.211]:47918 X-Source-Auth: tom+tromey.com X-Email-Count: 14 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== This changes a few functions in py-value.c to use gdbpy_reference. 2016-11-06 Tom Tromey * python/py-value.c (value_has_field, get_field_flag) (get_field_type, valpy_getitem, convert_value_from_python): Use gdbpy_reference. --- gdb/ChangeLog | 6 ++++++ gdb/python/py-value.c | 44 +++++++++++++++----------------------------- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f5392a3..56fadac 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2016-11-06 Tom Tromey + * python/py-value.c (value_has_field, get_field_flag) + (get_field_type, valpy_getitem, convert_value_from_python): Use + gdbpy_reference. + +2016-11-06 Tom Tromey + * python/python.c (gdbpy_progspaces, gdbpy_objfiles): Use gdbpy_reference. diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index 46683b8..7bca136 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -29,6 +29,7 @@ #include "python.h" #include "python-internal.h" +#include "py-ref.h" /* Even though Python scalar types directly map to host types, we use target types here to remain consistent with the values system in @@ -578,14 +579,13 @@ value_has_field (struct value *v, PyObject *field) { struct type *parent_type, *val_type; enum type_code type_code; - PyObject *type_object = PyObject_GetAttrString (field, "parent_type"); + gdbpy_reference type_object (PyObject_GetAttrString (field, "parent_type")); int has_field = 0; if (type_object == NULL) return -1; - parent_type = type_object_to_type (type_object); - Py_DECREF (type_object); + parent_type = type_object_to_type (type_object.get ()); if (parent_type == NULL) { PyErr_SetString (PyExc_TypeError, @@ -625,16 +625,12 @@ value_has_field (struct value *v, PyObject *field) static int get_field_flag (PyObject *field, const char *flag_name) { - int flag_value; - PyObject *flag_object = PyObject_GetAttrString (field, flag_name); + gdbpy_reference flag_object (PyObject_GetAttrString (field, flag_name)); if (flag_object == NULL) return -1; - flag_value = PyObject_IsTrue (flag_object); - Py_DECREF (flag_object); - - return flag_value; + return PyObject_IsTrue (flag_object.get ()); } /* Return the "type" attribute of a gdb.Field object. @@ -643,13 +639,12 @@ get_field_flag (PyObject *field, const char *flag_name) static struct type * get_field_type (PyObject *field) { - PyObject *ftype_obj = PyObject_GetAttrString (field, "type"); + gdbpy_reference ftype_obj (PyObject_GetAttrString (field, "type")); struct type *ftype; if (ftype_obj == NULL) return NULL; - ftype = type_object_to_type (ftype_obj); - Py_DECREF (ftype_obj); + ftype = type_object_to_type (ftype_obj.get ()); if (ftype == NULL) PyErr_SetString (PyExc_TypeError, _("'type' attribute of gdb.Field object is not a " @@ -705,25 +700,19 @@ valpy_getitem (PyObject *self, PyObject *key) } else { - PyObject *name_obj = PyObject_GetAttrString (key, "name"); + gdbpy_reference name_obj (PyObject_GetAttrString (key, "name")); if (name_obj == NULL) return NULL; if (name_obj != Py_None) { - field = python_string_to_host_string (name_obj); - Py_DECREF (name_obj); + field = python_string_to_host_string (name_obj.get ()); if (field == NULL) return NULL; } else { - PyObject *bitpos_obj; - int valid; - - Py_DECREF (name_obj); - if (!PyObject_HasAttrString (key, "bitpos")) { PyErr_SetString (PyExc_AttributeError, @@ -732,12 +721,11 @@ valpy_getitem (PyObject *self, PyObject *key) return NULL; } - bitpos_obj = PyObject_GetAttrString (key, "bitpos"); + gdbpy_reference bitpos_obj (PyObject_GetAttrString (key, + "bitpos")); if (bitpos_obj == NULL) return NULL; - valid = gdb_py_int_as_long (bitpos_obj, &bitpos); - Py_DECREF (bitpos_obj); - if (!valid) + if (!gdb_py_int_as_long (bitpos_obj.get (), &bitpos)) return NULL; field_type = get_field_type (key); @@ -1621,13 +1609,13 @@ convert_value_from_python (PyObject *obj) ULONGEST instead. */ if (PyErr_ExceptionMatches (PyExc_OverflowError)) { - PyObject *etype, *evalue, *etraceback, *zero; + PyObject *etype, *evalue, *etraceback; PyErr_Fetch (&etype, &evalue, &etraceback); - zero = PyInt_FromLong (0); + gdbpy_reference zero (PyInt_FromLong (0)); /* Check whether obj is positive. */ - if (PyObject_RichCompareBool (obj, zero, Py_GT) > 0) + if (PyObject_RichCompareBool (obj, zero.get (), Py_GT) > 0) { ULONGEST ul; @@ -1638,8 +1626,6 @@ convert_value_from_python (PyObject *obj) else /* There's nothing we can do. */ PyErr_Restore (etype, evalue, etraceback); - - Py_DECREF (zero); } } else