From 6e7c365ee0ea2551f9f840b71081fdf759088b5e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 7 Nov 2016 16:03:10 -0700 Subject: [PATCH] Use gdbpy_enter in py-finishbreakpoint.c Change py-finishbreakpoint.c to use gdbpy_enter. 2017-01-10 Tom Tromey * python/py-finishbreakpoint.c (bpfinishpy_handle_stop) (bpfinishpy_handle_exit): Use gdbpy_enter. --- gdb/ChangeLog | 5 +++++ gdb/python/py-finishbreakpoint.c | 10 ++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f02b2354af6..ab19c41765d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-01-10 Tom Tromey + + * python/py-finishbreakpoint.c (bpfinishpy_handle_stop) + (bpfinishpy_handle_exit): Use gdbpy_enter. + 2017-01-10 Tom Tromey * python/py-cmd.c (cmdpy_destroyer) diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpoint.c index da39d28c085..4e49ec70fb3 100644 --- a/gdb/python/py-finishbreakpoint.c +++ b/gdb/python/py-finishbreakpoint.c @@ -392,13 +392,10 @@ bpfinishpy_detect_out_scope_cb (struct breakpoint *b, void *args) static void bpfinishpy_handle_stop (struct bpstats *bs, int print_frame) { - struct cleanup *cleanup = ensure_python_env (get_current_arch (), - current_language); + gdbpy_enter enter_py (get_current_arch (), current_language); iterate_over_breakpoints (bpfinishpy_detect_out_scope_cb, bs == NULL ? NULL : bs->breakpoint_at); - - do_cleanups (cleanup); } /* Attached to `exit' notifications, triggers all the necessary out of @@ -407,12 +404,9 @@ bpfinishpy_handle_stop (struct bpstats *bs, int print_frame) static void bpfinishpy_handle_exit (struct inferior *inf) { - struct cleanup *cleanup = ensure_python_env (target_gdbarch (), - current_language); + gdbpy_enter enter_py (target_gdbarch (), current_language); iterate_over_breakpoints (bpfinishpy_detect_out_scope_cb, NULL); - - do_cleanups (cleanup); } /* Initialize the Python finish breakpoint code. */ -- 2.30.2