From 73dcd72d4eeec176f769660ddcdefd1f25d0a2ec Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 4 Oct 2017 11:07:28 +0100 Subject: [PATCH] Move code out of 'between TRY and CATCH' I tried building GDB with TRY/CATCH mapped to raw C++ try/catch (by defining GDB_XCPT to GDB_XCPT_RAW_TRY in gdb/common/common-exceptions.h), and that caught a case of code written between try and catch. This commit fixes it. gdb/ChangeLog: 2017-10-04 Pedro Alves * guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Move code out of 'between TRY and CATCH'. --- gdb/ChangeLog | 5 +++++ gdb/guile/scm-breakpoint.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bc58f51bcd..87f84ca312 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-10-04 Pedro Alves + + * guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Move code + out of 'between TRY and CATCH'. + 2017-10-04 Pedro Alves * cli/cli-cmds.c (complete_command): Add missing END_CATCH. diff --git a/gdb/guile/scm-breakpoint.c b/gdb/guile/scm-breakpoint.c index b6b68109f3..ec75be589f 100644 --- a/gdb/guile/scm-breakpoint.c +++ b/gdb/guile/scm-breakpoint.c @@ -988,13 +988,14 @@ gdbscm_breakpoint_commands (SCM self) { print_command_lines (current_uiout, breakpoint_commands (bp), 0); } - current_uiout->redirect (NULL); CATCH (except, RETURN_MASK_ALL) { + current_uiout->redirect (NULL); gdbscm_throw_gdb_exception (except); } END_CATCH + current_uiout->redirect (NULL); result = gdbscm_scm_from_c_string (buf.c_str ()); return result;