From: Tom Tromey <tom@tromey.com>
Date: Mon, 7 Nov 2016 23:08:36 +0000 (-0700)
Subject: Use gdbpy_enter in py-progspace.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bf7da5b06ffbbaa40c8a2900727a791265f897ea;p=binutils-gdb.git

Use gdbpy_enter in py-progspace.c

Change py-progspace.c to use gdbpy_enter.

2017-01-10  Tom Tromey  <tom@tromey.com>

	* python/py-progspace.c (py_free_pspace): Use gdbpy_enter.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9062025f329..ddc6578e57c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-10  Tom Tromey  <tom@tromey.com>
+
+	* python/py-progspace.c (py_free_pspace): Use gdbpy_enter.
+
 2017-01-10  Tom Tromey  <tom@tromey.com>
 
 	* python/py-objfile.c (py_free_objfile): Use gdbpy_enter.
diff --git a/gdb/python/py-progspace.c b/gdb/python/py-progspace.c
index a9ea82ba7cc..b0d94589858 100644
--- a/gdb/python/py-progspace.c
+++ b/gdb/python/py-progspace.c
@@ -323,7 +323,6 @@ pspy_set_type_printers (PyObject *o, PyObject *value, void *ignore)
 static void
 py_free_pspace (struct program_space *pspace, void *datum)
 {
-  struct cleanup *cleanup;
   pspace_object *object = (pspace_object *) datum;
   /* This is a fiction, but we're in a nasty spot: The pspace is in the
      process of being deleted, we can't rely on anything in it.  Plus
@@ -336,10 +335,9 @@ py_free_pspace (struct program_space *pspace, void *datum)
      being deleted.  */
   struct gdbarch *arch = target_gdbarch ();
 
-  cleanup = ensure_python_env (arch, current_language);
+  gdbpy_enter enter_py (arch, current_language);
   object->pspace = NULL;
   Py_DECREF ((PyObject *) object);
-  do_cleanups (cleanup);
 }
 
 /* Return a borrowed reference to the Python object of type Pspace