diff options
author | Pedro Alves <palves@redhat.com> | 2017-04-19 13:12:23 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2017-04-19 13:12:23 +0100 |
commit | 9bcb1f1630b05594fa86bfd017639cfcc966b11c (patch) | |
tree | 2f32099a2ea3e9427249d6911529c6b3b4c6d332 /gdb/inferior.h | |
parent | 26fcd539dd38a27259d8179152d617118f016706 (diff) | |
download | fsf-binutils-gdb-9bcb1f1630b05594fa86bfd017639cfcc966b11c.zip fsf-binutils-gdb-9bcb1f1630b05594fa86bfd017639cfcc966b11c.tar.gz fsf-binutils-gdb-9bcb1f1630b05594fa86bfd017639cfcc966b11c.tar.bz2 |
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 <palves@redhat.com>
* 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<T>&)): 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.
Diffstat (limited to 'gdb/inferior.h')
-rw-r--r-- | gdb/inferior.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gdb/inferior.h b/gdb/inferior.h index b5eb3d1..e39a80c 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -387,7 +387,7 @@ public: bool waiting_for_vfork_done = false; /* True if we're in the process of detaching from this inferior. */ - int detaching = 0; + bool detaching = false; /* What is left to do for an execution command after any thread of this inferior stops. For continuations associated with a |