From: Pedro Alves <palves@redhat.com>
Date: Wed, 4 Oct 2017 10:07:28 +0000 (+0100)
Subject: Move code out of 'between TRY and CATCH'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=73dcd72d4eeec176f769660ddcdefd1f25d0a2ec;p=binutils-gdb.git

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  <palves@redhat.com>

	* guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Move code
	out of 'between TRY and CATCH'.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bc58f51bcde..87f84ca3120 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-04  Pedro Alves  <palves@redhat.com>
+
+	* guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Move code
+	out of 'between TRY and CATCH'.
+
 2017-10-04  Pedro Alves  <palves@redhat.com>
 
 	* 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 b6b68109f30..ec75be589f0 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;