From patchwork Sun Nov 20 20:41:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 17647 Received: (qmail 1299 invoked by alias); 20 Nov 2016 20:41:57 -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 1168 invoked by uid 89); 20 Nov 2016 20:41:56 -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*F:U*tom, Hx-languages-length:2442, Hx-spam-relays-external:sk:gproxy4, Hx-spam-relays-external:69.89.23.142 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; Sun, 20 Nov 2016 20:41:46 +0000 Received: (qmail 19361 invoked by uid 0); 20 Nov 2016 20:41:45 -0000 Received: from unknown (HELO cmgw3) (10.0.90.84) by gproxy4.mail.unifiedlayer.com with SMTP; 20 Nov 2016 20:41:45 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id ALhi1u00M2f2jeq01Lhl9H; Sun, 20 Nov 2016 13:41:45 -0700 X-Authority-Analysis: v=2.1 cv=K/+xQUmI 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=ggMq8_3tfWvQemxsK3gA:9 a=N81b-9Aoa2aCJIG6:21 a=aWBSfAuPTvjgomTq:21 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 174-16-143-211.hlrn.qwest.net ([174.16.143.211]:40590 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1c8Yvm-0005f5-8s; Sun, 20 Nov 2016 13:41:42 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 05/13] Use gdbpy_ref in py_print_frame Date: Sun, 20 Nov 2016 13:41:28 -0700 Message-Id: <1479674496-14000-6-git-send-email-tom@tromey.com> In-Reply-To: <1479674496-14000-1-git-send-email-tom@tromey.com> References: <1479674496-14000-1-git-send-email-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1c8Yvm-0005f5-8s X-Source-Sender: 174-16-143-211.hlrn.qwest.net (bapiya.Home) [174.16.143.211]:40590 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== This changes py_print_frame to use gdbpy_ref in more places. 2016-11-20 Tom Tromey * python/py-framefilter.c (py_print_frame): Use gdbpy_ref. --- gdb/ChangeLog | 4 ++++ gdb/python/py-framefilter.c | 14 ++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 83ad836..545dbde 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2016-11-20 Tom Tromey + * python/py-framefilter.c (py_print_frame): Use gdbpy_ref. + +2016-11-20 Tom Tromey + * python/py-finishbreakpoint.c (bpfinishpy_out_of_scope): Use gdbpy_ref. diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index c0c7cde..ff1a068 100644 --- a/gdb/python/py-framefilter.c +++ b/gdb/python/py-framefilter.c @@ -1009,7 +1009,6 @@ py_print_frame (PyObject *filter, int flags, struct frame_info *frame = NULL; struct cleanup *cleanup_stack; struct value_print_options opts; - PyObject *py_inf_frame; int print_level, print_frame_info, print_args, print_locals; gdb::unique_xmalloc_ptr function_to_free; @@ -1024,14 +1023,11 @@ py_print_frame (PyObject *filter, int flags, /* Get the underlying frame. This is needed to determine GDB architecture, and also, in the cases of frame variables/arguments to read them if they returned filter object requires us to do so. */ - py_inf_frame = PyObject_CallMethod (filter, "inferior_frame", NULL); + gdbpy_ref py_inf_frame (PyObject_CallMethod (filter, "inferior_frame", NULL)); if (py_inf_frame == NULL) return EXT_LANG_BT_ERROR; - frame = frame_object_to_frame_info (py_inf_frame);; - - Py_DECREF (py_inf_frame); - + frame = frame_object_to_frame_info (py_inf_frame.get ()); if (frame == NULL) return EXT_LANG_BT_ERROR; @@ -1085,7 +1081,7 @@ py_print_frame (PyObject *filter, int flags, address printing. */ if (PyObject_HasAttrString (filter, "address")) { - PyObject *paddr = PyObject_CallMethod (filter, "address", NULL); + gdbpy_ref paddr (PyObject_CallMethod (filter, "address", NULL)); if (paddr == NULL) { @@ -1095,16 +1091,14 @@ py_print_frame (PyObject *filter, int flags, if (paddr != Py_None) { - if (get_addr_from_python (paddr, &address) < 0) + if (get_addr_from_python (paddr.get (), &address) < 0) { - Py_DECREF (paddr); do_cleanups (cleanup_stack); return EXT_LANG_BT_ERROR; } has_addr = 1; } - Py_DECREF (paddr); } }