From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 82986 invoked by alias); 10 Nov 2016 22:26:53 -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 82861 invoked by uid 89); 10 Nov 2016 22:26:52 -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: gproxy10-pub.mail.unifiedlayer.com Received: from gproxy10-pub.mail.unifiedlayer.com (HELO gproxy10-pub.mail.unifiedlayer.com) (69.89.20.226) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with SMTP; Thu, 10 Nov 2016 22:26:46 +0000 Received: (qmail 9757 invoked by uid 0); 10 Nov 2016 22:20:05 -0000 Received: from unknown (HELO cmgw3) (10.0.90.84) by gproxy10.mail.unifiedlayer.com with SMTP; 10 Nov 2016 22:20:05 -0000 Received: from box522.bluehost.com ([74.220.219.122]) by cmgw3 with id 6NL21u00j2f2jeq01NL5He; Thu, 10 Nov 2016 15:20:05 -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=h0gpQJiJkT6Ilv09QdIA: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 1c4xhR-0002sd-WB; Thu, 10 Nov 2016 15:20:02 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 19/20] Introduce gdbpy_enter_varobj and use it Date: Thu, 10 Nov 2016 22:26:00 -0000 Message-Id: <1478816387-27064-20-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: 1c4xhR-0002sd-WB 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: 20 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-SW-Source: 2016-11/txt/msg00271.txt.bz2 This introduces gdbpy_enter_varobj, a subclass of gdbpy_enter; then changes one function in py-varobj.c to use it. gdbpy_enter_varobj takes a varobj as an argument, similar to varobj_ensure_python_env. 2016-11-10 Tom Tromey * varobj.c (gdbpy_enter_varobj): New constructor. * python/python-internal.h (gdbpy_enter_varobj): New class. * python/py-varobj.c (py_varobj_get_iterator): Use gdbpy_enter_varobj. --- gdb/ChangeLog | 7 +++++++ gdb/python/py-varobj.c | 21 ++++++++------------- gdb/python/python-internal.h | 12 ++++++++++++ gdb/varobj.c | 7 +++++++ 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 41e4081..839f24d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2016-11-10 Tom Tromey + * varobj.c (gdbpy_enter_varobj): New constructor. + * python/python-internal.h (gdbpy_enter_varobj): New class. + * python/py-varobj.c (py_varobj_get_iterator): Use + gdbpy_enter_varobj. + +2016-11-10 Tom Tromey + * python/py-xmethods.c (gdbpy_get_xmethod_result_type): Use gdbpy_enter, gdbpy_reference, unique_xmalloc_ptr. (gdbpy_invoke_xmethod): Use gdbpy_reference, gdbpy_enter. diff --git a/gdb/python/py-varobj.c b/gdb/python/py-varobj.c index 72c876c..5d02549 100644 --- a/gdb/python/py-varobj.c +++ b/gdb/python/py-varobj.c @@ -17,6 +17,7 @@ #include "python-internal.h" #include "varobj.h" #include "varobj-iter.h" +#include "py-ref.h" /* A dynamic varobj iterator "class" for python pretty-printed varobjs. This inherits struct varobj_iter. */ @@ -167,28 +168,24 @@ py_varobj_iter_new (struct varobj *var, PyObject *pyiter) struct varobj_iter * py_varobj_get_iterator (struct varobj *var, PyObject *printer) { - PyObject *children; PyObject *iter; struct py_varobj_iter *py_iter; - struct cleanup *back_to = varobj_ensure_python_env (var); + + gdbpy_enter_varobj enter_py (var); if (!PyObject_HasAttr (printer, gdbpy_children_cst)) - { - do_cleanups (back_to); - return NULL; - } + return NULL; - children = PyObject_CallMethodObjArgs (printer, gdbpy_children_cst, - NULL); + gdbpy_reference children (PyObject_CallMethodObjArgs (printer, + gdbpy_children_cst, + NULL)); if (children == NULL) { gdbpy_print_stack (); error (_("Null value returned for children")); } - make_cleanup_py_decref (children); - - iter = PyObject_GetIter (children); + iter = PyObject_GetIter (children.get ()); if (iter == NULL) { gdbpy_print_stack (); @@ -197,7 +194,5 @@ py_varobj_get_iterator (struct varobj *var, PyObject *printer) py_iter = py_varobj_iter_new (var, iter); - do_cleanups (back_to); - return &py_iter->base; } diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index 2aca6ff..66856df 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -524,6 +524,18 @@ class gdbpy_enter PyObject *m_error_type, *m_error_value, *m_error_traceback; }; +/* Like gdbpy_enter, but takes a varobj. This is a subclass just to + make constructor delegation a little nicer. */ +class gdbpy_enter_varobj : public gdbpy_enter +{ + public: + + /* This is defined in varobj.c, where it can access varobj + internals. */ + gdbpy_enter_varobj (const struct varobj *var); + +}; + struct cleanup *ensure_python_env (struct gdbarch *gdbarch, const struct language_defn *language); diff --git a/gdb/varobj.c b/gdb/varobj.c index 03edf0e..8abda59 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -233,6 +233,13 @@ varobj_ensure_python_env (const struct varobj *var) return ensure_python_env (var->root->exp->gdbarch, var->root->exp->language_defn); } + +/* See python-internal.h. */ +gdbpy_enter_varobj::gdbpy_enter_varobj (const struct varobj *var) +: gdbpy_enter (var->root->exp->gdbarch, var->root->exp->language_defn) +{ +} + #endif /* Return the full FRAME which corresponds to the given CORE_ADDR -- 2.7.4