From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8840 invoked by alias); 20 Nov 2016 20:42:21 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 8423 invoked by uid 89); 20 Nov 2016 20:42:20 -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=Hx-languages-length:5178, TRY, Hx-spam-relays-external:69.89.25.95, H*RU:sk:gproxy1 X-HELO: gproxy1.mail.unifiedlayer.com Received: from gproxy1-pub.mail.unifiedlayer.com (HELO gproxy1.mail.unifiedlayer.com) (69.89.25.95) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 20 Nov 2016 20:42:15 +0000 Received: from cmgw4 (cmgw5 [10.0.90.85]) by gproxy1.mail.unifiedlayer.com (Postfix) with ESMTP id EAC78176967 for ; Sun, 20 Nov 2016 13:41:47 -0700 (MST) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id ALhk1u00k2f2jeq01Lhnnp; Sun, 20 Nov 2016 13:41:47 -0700 X-Authority-Analysis: v=2.1 cv=Zpp+dbLG 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=2oZY0XUNpI9Kd6QqLW4A:9 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 1c8Yvo-0005f5-Mp; Sun, 20 Nov 2016 13:41:44 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 12/13] Use gdbpy_ref rather than make_cleanup_py_decref Date: Sun, 20 Nov 2016 20:42:00 -0000 Message-Id: <1479674496-14000-13-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: 1c8Yvo-0005f5-Mp 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: 14 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-SW-Source: 2016-11/txt/msg00594.txt.bz2 This changes some spots in py-framefilter.c to use gdbpy_ref rather than make_cleanup_py_decref or make_cleanup_py_xdecref. 2016-11-20 Tom Tromey * python/py-framefilter.c (py_mi_print_variables): Use gdbpy_ref. (py_print_locals, enumerate_locals, py_print_args): Use gdbpy_ref. --- gdb/ChangeLog | 5 ++++ gdb/python/py-framefilter.c | 59 +++++++++++++++++++++------------------------ 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c9671de..b974442 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-11-20 Tom Tromey + * python/py-framefilter.c (py_mi_print_variables): Use gdbpy_ref. + (py_print_locals, enumerate_locals, py_print_args): Use gdbpy_ref. + +2016-11-20 Tom Tromey + * python/py-framefilter.c (enumerate_args): Use gdbpy_ref. 2016-11-20 Tom Tromey diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index dc41790..07176cc 100644 --- a/gdb/python/py-framefilter.c +++ b/gdb/python/py-framefilter.c @@ -693,13 +693,12 @@ enumerate_locals (PyObject *iter, int print_args_field, struct frame_info *frame) { - PyObject *item; struct value_print_options opts; get_user_print_options (&opts); opts.deref_ref = 1; - while ((item = PyIter_Next (iter))) + while (true) { const struct language_defn *language; gdb::unique_xmalloc_ptr sym_name; @@ -710,16 +709,21 @@ enumerate_locals (PyObject *iter, int local_indent = 8 + (8 * indent); struct cleanup *locals_cleanups; - locals_cleanups = make_cleanup_py_decref (item); + gdbpy_ref item (PyIter_Next (iter)); + if (item == NULL) + break; + + locals_cleanups = make_cleanup (null_cleanup, NULL); - success = extract_sym (item, &sym_name, &sym, &sym_block, &language); + success = extract_sym (item.get (), &sym_name, &sym, &sym_block, + &language); if (success == EXT_LANG_BT_ERROR) { do_cleanups (locals_cleanups); goto error; } - success = extract_value (item, &val); + success = extract_value (item.get (), &val); if (success == EXT_LANG_BT_ERROR) { do_cleanups (locals_cleanups); @@ -827,10 +831,8 @@ enumerate_locals (PyObject *iter, END_CATCH } - if (item == NULL && PyErr_Occurred ()) - goto error; - - return EXT_LANG_BT_OK; + if (!PyErr_Occurred ()) + return EXT_LANG_BT_OK; error: return EXT_LANG_BT_ERROR; @@ -846,28 +848,24 @@ py_mi_print_variables (PyObject *filter, struct ui_out *out, struct frame_info *frame) { struct cleanup *old_chain; - PyObject *args_iter; - PyObject *locals_iter; - args_iter = get_py_iter_from_func (filter, "frame_args"); - old_chain = make_cleanup_py_xdecref (args_iter); + gdbpy_ref args_iter (get_py_iter_from_func (filter, "frame_args")); if (args_iter == NULL) - goto error; + return EXT_LANG_BT_ERROR; - locals_iter = get_py_iter_from_func (filter, "frame_locals"); + gdbpy_ref locals_iter (get_py_iter_from_func (filter, "frame_locals")); if (locals_iter == NULL) - goto error; + return EXT_LANG_BT_ERROR; - make_cleanup_py_decref (locals_iter); - make_cleanup_ui_out_list_begin_end (out, "variables"); + old_chain = make_cleanup_ui_out_list_begin_end (out, "variables"); if (args_iter != Py_None) - if (enumerate_args (args_iter, out, args_type, 1, frame) + if (enumerate_args (args_iter.get (), out, args_type, 1, frame) == EXT_LANG_BT_ERROR) goto error; if (locals_iter != Py_None) - if (enumerate_locals (locals_iter, out, 1, args_type, 1, frame) + if (enumerate_locals (locals_iter.get (), out, 1, args_type, 1, frame) == EXT_LANG_BT_ERROR) goto error; @@ -890,17 +888,16 @@ py_print_locals (PyObject *filter, int indent, struct frame_info *frame) { - PyObject *locals_iter = get_py_iter_from_func (filter, - "frame_locals"); - struct cleanup *old_chain = make_cleanup_py_xdecref (locals_iter); + struct cleanup *old_chain; + gdbpy_ref locals_iter (get_py_iter_from_func (filter, "frame_locals")); if (locals_iter == NULL) - goto locals_error; + return EXT_LANG_BT_ERROR; - make_cleanup_ui_out_list_begin_end (out, "locals"); + old_chain = make_cleanup_ui_out_list_begin_end (out, "locals"); if (locals_iter != Py_None) - if (enumerate_locals (locals_iter, out, indent, args_type, + if (enumerate_locals (locals_iter.get (), out, indent, args_type, 0, frame) == EXT_LANG_BT_ERROR) goto locals_error; @@ -923,13 +920,13 @@ py_print_args (PyObject *filter, enum ext_lang_frame_args args_type, struct frame_info *frame) { - PyObject *args_iter = get_py_iter_from_func (filter, "frame_args"); - struct cleanup *old_chain = make_cleanup_py_xdecref (args_iter); + struct cleanup *old_chain; + gdbpy_ref args_iter (get_py_iter_from_func (filter, "frame_args")); if (args_iter == NULL) - goto args_error; + return EXT_LANG_BT_ERROR; - make_cleanup_ui_out_list_begin_end (out, "args"); + old_chain = make_cleanup_ui_out_list_begin_end (out, "args"); TRY { @@ -945,7 +942,7 @@ py_print_args (PyObject *filter, END_CATCH if (args_iter != Py_None) - if (enumerate_args (args_iter, out, args_type, 0, frame) + if (enumerate_args (args_iter.get (), out, args_type, 0, frame) == EXT_LANG_BT_ERROR) goto args_error; -- 2.7.4