From patchwork Thu Nov 10 22:19:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 17396 Received: (qmail 64481 invoked by alias); 10 Nov 2016 22:20:38 -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 64369 invoked by uid 89); 10 Nov 2016 22:20:38 -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= X-HELO: gproxy4-pub.mail.unifiedlayer.com Received: from gproxy4-pub.mail.unifiedlayer.com (HELO gproxy4-pub.mail.unifiedlayer.com) (69.89.23.142) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with SMTP; Thu, 10 Nov 2016 22:20:05 +0000 Received: (qmail 29496 invoked by uid 0); 10 Nov 2016 22:20:04 -0000 Received: from unknown (HELO cmgw3) (10.0.90.84) by gproxy4.mail.unifiedlayer.com with SMTP; 10 Nov 2016 22:20:03 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id 6NL01u01V2f2jeq01NL3Ez; Thu, 10 Nov 2016 15:20:03 -0700 X-Authority-Analysis: v=2.1 cv=WL/sABcR 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=qKyzG6DxqCsKhd6Z4BUA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 174-16-143-211.hlrn.qwest.net ([174.16.143.211]:60120 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1c4xhQ-0002sd-On; Thu, 10 Nov 2016 15:20:00 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 17/20] Use gdbpy_reference in invoke_match_method Date: Thu, 10 Nov 2016 15:19:44 -0700 Message-Id: <1478816387-27064-18-git-send-email-tom@tromey.com> In-Reply-To: <1478816387-27064-1-git-send-email-tom@tromey.com> References: <1478816387-27064-1-git-send-email-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1c4xhQ-0002sd-On X-Source-Sender: 174-16-143-211.hlrn.qwest.net (bapiya.Home) [174.16.143.211]:60120 X-Source-Auth: tom+tromey.com X-Email-Count: 18 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== Change invoke_match_method to use gdbpy_reference. I neglected to convert this function in my earlier series. 2016-11-10 Tom Tromey * python/py-xmethods.c (invoke_match_method): Use gdbpy_reference. --- gdb/ChangeLog | 5 +++++ gdb/python/py-xmethods.c | 51 ++++++++++++------------------------------------ 2 files changed, 18 insertions(+), 38 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fef6a71..cb0492d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-11-10 Tom Tromey + * python/py-xmethods.c (invoke_match_method): Use + gdbpy_reference. + +2016-11-10 Tom Tromey + * python/py-xmethods.c (gdbpy_get_matching_xmethod_workers): use gdbpy_enter, gdbpy_reference. diff --git a/gdb/python/py-xmethods.c b/gdb/python/py-xmethods.c index ca83b0b..a5319cc 100644 --- a/gdb/python/py-xmethods.c +++ b/gdb/python/py-xmethods.c @@ -94,59 +94,34 @@ static PyObject * invoke_match_method (PyObject *matcher, PyObject *py_obj_type, const char *xmethod_name) { - PyObject *py_xmethod_name; - PyObject *match_method, *enabled_field, *match_result; - struct cleanup *cleanups; int enabled; - cleanups = make_cleanup (null_cleanup, NULL); - - enabled_field = PyObject_GetAttrString (matcher, enabled_field_name); + gdbpy_reference enabled_field (PyObject_GetAttrString (matcher, + enabled_field_name)); if (enabled_field == NULL) - { - do_cleanups (cleanups); - return NULL; - } - make_cleanup_py_decref (enabled_field); + return NULL; - enabled = PyObject_IsTrue (enabled_field); + enabled = PyObject_IsTrue (enabled_field.get ()); if (enabled == -1) - { - do_cleanups (cleanups); - return NULL; - } + return NULL; if (enabled == 0) { /* Return 'None' if the matcher is not enabled. */ - do_cleanups (cleanups); Py_RETURN_NONE; } - match_method = PyObject_GetAttrString (matcher, match_method_name); + gdbpy_reference match_method (PyObject_GetAttrString (matcher, + match_method_name)); if (match_method == NULL) - { - do_cleanups (cleanups); - return NULL; - } - make_cleanup_py_decref (match_method); + return NULL; - py_xmethod_name = PyString_FromString (xmethod_name); + gdbpy_reference py_xmethod_name (PyString_FromString (xmethod_name)); if (py_xmethod_name == NULL) - { - do_cleanups (cleanups); - return NULL; - } - make_cleanup_py_decref (py_xmethod_name); - - match_result = PyObject_CallMethodObjArgs (matcher, - py_match_method_name, - py_obj_type, - py_xmethod_name, - NULL); - - do_cleanups (cleanups); + return NULL; - return match_result; + return PyObject_CallMethodObjArgs (matcher, py_match_method_name, + py_obj_type, py_xmethod_name.get (), + NULL); } /* Implementation of get_matching_xmethod_workers for Python. */