From patchwork Sun Nov 20 20:41:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 17658 Received: (qmail 41941 invoked by alias); 20 Nov 2016 20:48:39 -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 41929 invoked by uid 89); 20 Nov 2016 20:48: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=608, 7, Hx-languages-length:4372, TRY, RETURN_MASK_ALL 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:48:28 +0000 Received: (qmail 19407 invoked by uid 0); 20 Nov 2016 20:41:47 -0000 Received: from unknown (HELO cmgw3) (10.0.90.84) by gproxy4.mail.unifiedlayer.com with SMTP; 20 Nov 2016 20:41:47 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id ALhk1u00E2f2jeq01LhnAp; Sun, 20 Nov 2016 13:41:47 -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=xllP3jCP9pyWQtETvOsA: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-3q; Sun, 20 Nov 2016 13:41:44 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 11/13] Use gdbpy_ref in enumerate_args Date: Sun, 20 Nov 2016 13:41:34 -0700 Message-Id: <1479674496-14000-12-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-3q 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: 13 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== This changes enumerate_args to use gdbpy_ref, and gets rid of many gotos. 2016-11-20 Tom Tromey * python/py-framefilter.c (enumerate_args): Use gdbpy_ref. --- gdb/ChangeLog | 4 ++++ gdb/python/py-framefilter.c | 56 +++++++++++++++++---------------------------- 2 files changed, 25 insertions(+), 35 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4f8447c..c9671de 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2016-11-20 Tom Tromey + * python/py-framefilter.c (enumerate_args): Use gdbpy_ref. + +2016-11-20 Tom Tromey + * python/py-utils.c (unicode_to_encoded_string) (python_string_to_target_string) (python_string_to_target_python_string) diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index ff1a068..dc41790 100644 --- a/gdb/python/py-framefilter.c +++ b/gdb/python/py-framefilter.c @@ -497,7 +497,6 @@ enumerate_args (PyObject *iter, int print_args_field, struct frame_info *frame) { - PyObject *item; struct value_print_options opts; get_user_print_options (&opts); @@ -517,7 +516,7 @@ enumerate_args (PyObject *iter, CATCH (except, RETURN_MASK_ALL) { gdbpy_convert_exception (except); - goto error; + return EXT_LANG_BT_ERROR; } END_CATCH @@ -525,11 +524,11 @@ enumerate_args (PyObject *iter, commas in the argument output is correct. At the end of the loop block collect another item from the iterator, and, if it is not null emit a comma. */ - item = PyIter_Next (iter); + gdbpy_ref item (PyIter_Next (iter)); if (item == NULL && PyErr_Occurred ()) - goto error; + return EXT_LANG_BT_ERROR; - while (item) + while (item != NULL) { const struct language_defn *language; gdb::unique_xmalloc_ptr sym_name; @@ -538,22 +537,14 @@ enumerate_args (PyObject *iter, struct value *val; enum ext_lang_bt_status success = EXT_LANG_BT_ERROR; - 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) - { - Py_DECREF (item); - goto error; - } + return EXT_LANG_BT_ERROR; - success = extract_value (item, &val); + success = extract_value (item.get (), &val); if (success == EXT_LANG_BT_ERROR) - { - Py_DECREF (item); - goto error; - } - - Py_DECREF (item); - item = NULL; + return EXT_LANG_BT_ERROR; if (sym && ui_out_is_mi_like_p (out) && ! mi_should_print (sym, MI_PRINT_ARGS)) @@ -571,7 +562,7 @@ enumerate_args (PyObject *iter, { PyErr_SetString (PyExc_RuntimeError, _("No symbol or value provided.")); - goto error; + return EXT_LANG_BT_ERROR; } TRY @@ -581,7 +572,7 @@ enumerate_args (PyObject *iter, CATCH (except, RETURN_MASK_ALL) { gdbpy_convert_exception (except); - goto error; + return EXT_LANG_BT_ERROR; } END_CATCH @@ -599,7 +590,7 @@ enumerate_args (PyObject *iter, { xfree (arg.error); xfree (entryarg.error); - goto error; + return EXT_LANG_BT_ERROR; } } @@ -617,7 +608,7 @@ enumerate_args (PyObject *iter, xfree (arg.error); xfree (entryarg.error); gdbpy_convert_exception (except); - goto error; + return EXT_LANG_BT_ERROR; } END_CATCH } @@ -626,9 +617,9 @@ enumerate_args (PyObject *iter, args_type, print_args_field, NULL) == EXT_LANG_BT_ERROR) { - xfree (arg.error); - xfree (entryarg.error); - goto error; + xfree (arg.error); + xfree (entryarg.error); + return EXT_LANG_BT_ERROR; } } @@ -643,14 +634,14 @@ enumerate_args (PyObject *iter, if (py_print_single_arg (out, sym_name.get (), NULL, val, &opts, args_type, print_args_field, language) == EXT_LANG_BT_ERROR) - goto error; + return EXT_LANG_BT_ERROR; } } /* Collect the next item from the iterator. If this is the last item, do not print the comma. */ - item = PyIter_Next (iter); + item.reset (PyIter_Next (iter)); if (item != NULL) { TRY @@ -659,14 +650,13 @@ enumerate_args (PyObject *iter, } CATCH (except, RETURN_MASK_ALL) { - Py_DECREF (item); gdbpy_convert_exception (except); - goto error; + return EXT_LANG_BT_ERROR; } END_CATCH } else if (PyErr_Occurred ()) - goto error; + return EXT_LANG_BT_ERROR; TRY { @@ -674,17 +664,13 @@ enumerate_args (PyObject *iter, } CATCH (except, RETURN_MASK_ALL) { - Py_DECREF (item); gdbpy_convert_exception (except); - goto error; + return EXT_LANG_BT_ERROR; } END_CATCH } return EXT_LANG_BT_OK; - - error: - return EXT_LANG_BT_ERROR; }