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

Use gdbpy_enter in py-objfile.c

Change py-objfile.c to 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/ChangeLog b/gdb/ChangeLog
index d3f7b0599b7..9062025f329 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-10  Tom Tromey  <tom@tromey.com>
+
+	* python/py-objfile.c (py_free_objfile): Use gdbpy_enter.
+
 2017-01-10  Tom Tromey  <tom@tromey.com>
 
 	* python/py-inferior.c (python_on_normal_stop, python_on_resume)
diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c
index 2585f6256eb..8ac93f9f6f3 100644
--- a/gdb/python/py-objfile.c
+++ b/gdb/python/py-objfile.c
@@ -612,13 +612,11 @@ gdbpy_lookup_objfile (PyObject *self, PyObject *args, PyObject *kw)
 static void
 py_free_objfile (struct objfile *objfile, void *datum)
 {
-  struct cleanup *cleanup;
   objfile_object *object = (objfile_object *) datum;
 
-  cleanup = ensure_python_env (get_objfile_arch (objfile), current_language);
+  gdbpy_enter enter_py (get_objfile_arch (objfile), current_language);
   object->objfile = NULL;
   Py_DECREF ((PyObject *) object);
-  do_cleanups (cleanup);
 }
 
 /* Return a borrowed reference to the Python object of type Objfile