From 9bcb1f1630b05594fa86bfd017639cfcc966b11c Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 19 Apr 2017 13:12:23 +0100 Subject: Make inferior::detaching a bool, and introduce scoped_restore::release() I left making inferior::detaching a bool to a separate patch, because doing that makes a make_cleanup_restore_integer call in infrun.c:prepare_for_detach no longer compile (passing a 'bool *' when an 'int *' is expected). Since we want to get rid of cleanups anyway, I looked at converting that to a scoped_restore. However, prepare_for_detach wants to discard the cleanup on success, and scoped_restore doesn't have an equivalent for that. So I added one -- I called it "release()" because it seems like a natural fit in the way standard components call similarly-spirited methods, and, it's also what the proposal for a generic scope guard calls it too, AFAICS: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189.pdf I've added some scoped_guard unit tests, while at it. gdb/ChangeLog: 2017-04-19 Pedro Alves * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add unittests/scoped_restore-selftests.c. (SUBDIR_UNITTESTS_OBS): Add scoped_restore-selftests.o. * common/scoped_restore.h (scoped_restore_base): Make "class". (scoped_restore_base::release): New public method. (scoped_restore_base::scoped_restore_base): New protected ctor. (scoped_restore_base::m_saved_var): New protected field. (scoped_restore_tmpl::scoped_restore_tmpl(T*)): Initialize the scoped_restore_base base class instead of m_saved_var directly. (scoped_restore_tmpl::scoped_restore_tmpl(T*, T2)): Likewise. (scoped_restore_tmpl::scoped_restore_tmpl(const scoped_restore_tmpl&)): Likewise. (scoped_restore_tmpl::~scoped_restore_tmpl): Use the saved_var method. (scoped_restore_tmpl::saved_var): New method. (scoped_restore_tmpl::m_saved_var): Delete. * inferior.h (inferior::detaching): Now a bool. * infrun.c (prepare_for_detach): Use a scoped_restore instead of a cleanup. * unittests/scoped_restore-selftests.c: New file. --- gdb/infrun.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gdb/infrun.c') diff --git a/gdb/infrun.c b/gdb/infrun.c index c7298a3..fcafdc1 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3630,7 +3630,6 @@ prepare_for_detach (void) { struct inferior *inf = current_inferior (); ptid_t pid_ptid = pid_to_ptid (inf->pid); - struct cleanup *old_chain_1; struct displaced_step_inferior_state *displaced; displaced = get_displaced_stepping_state (inf->pid); @@ -3644,8 +3643,7 @@ prepare_for_detach (void) fprintf_unfiltered (gdb_stdlog, "displaced-stepping in-process while detaching"); - old_chain_1 = make_cleanup_restore_integer (&inf->detaching); - inf->detaching = 1; + scoped_restore restore_detaching = make_scoped_restore (&inf->detaching, true); while (!ptid_equal (displaced->step_ptid, null_ptid)) { @@ -3685,12 +3683,12 @@ prepare_for_detach (void) inferior, so this must mean the process is gone. */ if (!ecs->wait_some_more) { - discard_cleanups (old_chain_1); + restore_detaching.release (); error (_("Program exited while detaching")); } } - discard_cleanups (old_chain_1); + restore_detaching.release (); } /* Wait for control to return from inferior to debugger. -- cgit v1.1