[RFA 17/22] Remove make_cleanup_restore_current_uiout

[Tom Tromey <tom@tromey.com>]

This removes make_cleanup_restore_current_uiout in favor of an
RAII-based class.

2016-09-26  Tom Tromey  <tom@tromey.com>

	* ui-out.c (make_cleanup_restore_current_uiout)
	(restore_current_uiout_cleanup): Remove.
	* infrun.c (print_stop_event): Use scoped_restore_uiout.
	* ui-out.h (scoped_restore_uiout): New class.
	(make_cleanup_restore_current_uiout): Don't declare.
---
 gdb/ChangeLog       |  8 ++++++++
 gdb/infrun.c        | 15 +++++++--------
 gdb/python/python.c |  3 +--
 gdb/ui-out.c        | 18 ------------------
 gdb/ui-out.h        | 25 +++++++++++++++++++++++--
 5 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 770a96f..89ce46f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
 2016-09-26  Tom Tromey  <tom@tromey.com>
 
+	* ui-out.c (make_cleanup_restore_current_uiout)
+	(restore_current_uiout_cleanup): Remove.
+	* infrun.c (print_stop_event): Use scoped_restore_uiout.
+	* ui-out.h (scoped_restore_uiout): New class.
+	(make_cleanup_restore_current_uiout): Don't declare.
+
+2016-09-26  Tom Tromey  <tom@tromey.com>
+
 	* elfread.c (elf_read_minimal_symbols): Use std::vector.
 
 2016-09-26  Tom Tromey  <tom@tromey.com>
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 1736526..7136d00 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -8084,22 +8084,21 @@ print_stop_location (struct target_waitstatus *ws)
 void
 print_stop_event (struct ui_out *uiout)
 {
-  struct cleanup *old_chain;
   struct target_waitstatus last;
   ptid_t last_ptid;
   struct thread_info *tp;
 
   get_last_target_status (&last_ptid, &last);
 
-  old_chain = make_cleanup_restore_current_uiout ();
-  current_uiout = uiout;
-
-  print_stop_location (&last);
+  {
+    scoped_restore_uiout save_uiout;
+    current_uiout = uiout;
 
-  /* Display the auto-display expressions.  */
-  do_displays ();
+    print_stop_location (&last);
 
-  do_cleanups (old_chain);
+    /* Display the auto-display expressions.  */
+    do_displays ();
+  }
 
   tp = inferior_thread ();
   if (tp->thread_fsm != NULL
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 9e4d610..b98ef90 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -647,8 +647,7 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
       struct interp *interp;
 
       scoped_restore<int> save_async (&current_ui->async, 0);
-
-      make_cleanup_restore_current_uiout ();
+      scoped_restore_uiout save_uiout;
 
       /* Use the console interpreter uiout to have the same print format
 	for console or MI.  */
diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index ec44ab6..3972a56 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -953,24 +953,6 @@ ui_out_destroy (struct ui_out *uiout)
   xfree (uiout);
 }
 
-/* Cleanup that restores a previous current uiout.  */
-
-static void
-restore_current_uiout_cleanup (void *arg)
-{
-  struct ui_out *saved_uiout = (struct ui_out *) arg;
-
-  current_uiout = saved_uiout;
-}
-
-/* See ui-out.h.  */
-
-struct cleanup *
-make_cleanup_restore_current_uiout (void)
-{
-  return make_cleanup (restore_current_uiout_cleanup, current_uiout);
-}
-
 /* Standard gdb initialization hook.  */
 
 void
diff --git a/gdb/ui-out.h b/gdb/ui-out.h
index 6a4d78a..12daafd 100644
--- a/gdb/ui-out.h
+++ b/gdb/ui-out.h
@@ -247,8 +247,29 @@ extern void ui_out_destroy (struct ui_out *uiout);
 
 extern int ui_out_redirect (struct ui_out *uiout, struct ui_file *outstream);
 
-/* Make a cleanup that restores the previous current uiout.  */
+/* An RAII-based class that saves and restores the current uiout.  */
 
-extern struct cleanup *make_cleanup_restore_current_uiout (void);
+class scoped_restore_uiout
+{
+ public:
+
+  scoped_restore_uiout () : saved (current_uiout)
+  {
+  }
+
+  ~scoped_restore_uiout ()
+  {
+    current_uiout = saved;
+  }
+
+ private:
+
+  // No need for these.  They are intentionally not defined anywhere.
+  scoped_restore_uiout &operator= (const scoped_restore_uiout &);
+  scoped_restore_uiout (const scoped_restore_uiout &);
+
+  // The saved ui out.
+  struct ui_out *saved;
+};
 
 #endif /* UI_OUT_H */
-- 
2.7.4