From 6cd67beaae58c9e870b79feea3cf74ffdf7a9b33 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Tue, 8 Nov 2016 16:18:24 -0700
Subject: Introduce gdbpy_enter_varobj and use it
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.
2017-01-10 Tom Tromey <tom@tromey.com>
* 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/python/py-varobj.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
(limited to 'gdb/python/py-varobj.c')
diff --git a/gdb/python/py-varobj.c b/gdb/python/py-varobj.c
index c8684bd..ffdfa30 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,23 @@ 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_ref 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 +193,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;
}
--
cgit v1.1