From f18e226ff84f7fba9ce7197ed7a2969eba231b4d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 7 Nov 2016 16:13:40 -0700 Subject: [PATCH] Use gdbpy_enter in py-xmethods.c Change the simple parts of py-xmethods.c to use gdbpy_enter. 2017-01-10 Tom Tromey * python/py-xmethods.c (gdbpy_free_xmethod_worker_data) (gdbpy_clone_xmethod_worker_data): Use gdbpy_enter. --- gdb/ChangeLog | 5 +++++ gdb/python/py-xmethods.c | 10 ++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 28b599b0dc..344452b2c4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-01-10 Tom Tromey + + * python/py-xmethods.c (gdbpy_free_xmethod_worker_data) + (gdbpy_clone_xmethod_worker_data): Use gdbpy_enter. + 2017-01-10 Tom Tromey * python/py-type.c (save_objfile_types): Use gdbpy_enter. diff --git a/gdb/python/py-xmethods.c b/gdb/python/py-xmethods.c index f4947abc4a..eab69a03d7 100644 --- a/gdb/python/py-xmethods.c +++ b/gdb/python/py-xmethods.c @@ -52,18 +52,15 @@ gdbpy_free_xmethod_worker_data (const struct extension_language_defn *extlang, void *data) { struct gdbpy_worker_data *worker_data = (struct gdbpy_worker_data *) data; - struct cleanup *cleanups; gdb_assert (worker_data->worker != NULL && worker_data->this_type != NULL); /* We don't do much here, but we still need the GIL. */ - cleanups = ensure_python_env (get_current_arch (), current_language); + gdbpy_enter enter_py (get_current_arch (), current_language); Py_DECREF (worker_data->worker); Py_DECREF (worker_data->this_type); xfree (worker_data); - - do_cleanups (cleanups); } /* Implementation of clone_xmethod_worker_data for Python. */ @@ -74,12 +71,11 @@ gdbpy_clone_xmethod_worker_data (const struct extension_language_defn *extlang, { struct gdbpy_worker_data *worker_data = (struct gdbpy_worker_data *) data, *new_data; - struct cleanup *cleanups; gdb_assert (worker_data->worker != NULL && worker_data->this_type != NULL); /* We don't do much here, but we still need the GIL. */ - cleanups = ensure_python_env (get_current_arch (), current_language); + gdbpy_enter enter_py (get_current_arch (), current_language); new_data = XCNEW (struct gdbpy_worker_data); new_data->worker = worker_data->worker; @@ -87,8 +83,6 @@ gdbpy_clone_xmethod_worker_data (const struct extension_language_defn *extlang, Py_INCREF (new_data->worker); Py_INCREF (new_data->this_type); - do_cleanups (cleanups); - return new_data; } -- 2.34.1