diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-02-15 14:00:36 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-02-15 15:52:25 +0000 |
| commit | d27153f038c2f39ed1b7e6ba9dab59f88b8ca245 (patch) | |
| tree | ab414963f73495cd1e61545cffb3294fd254c31d | |
| parent | abe07a74bb7a2692eff2af151ca54e749ed5eba6 (diff) | |
| download | gcc-d27153f038c2f39ed1b7e6ba9dab59f88b8ca245.zip gcc-d27153f038c2f39ed1b7e6ba9dab59f88b8ca245.tar.gz gcc-d27153f038c2f39ed1b7e6ba9dab59f88b8ca245.tar.bz2 | |
libstdc++: Add missing return and use reserved name
The once_flag::_M_activate() function is only ever called immediately
after a call to once_flag::_M_passive(), and so in the non-gthreads case
it is impossible for _M_passive() to be true in the body of
_M_activate(). Add a check for it anyway, to avoid warnings about
missing return.
Also replace a non-reserved name with a reserved one.
libstdc++-v3/ChangeLog:
* include/std/mutex (once_flag::_M_activate()): Add explicit
return statement for passive case.
(once_flag::_M_finish(bool)): Use reserved name for parameter.
| -rw-r--r-- | libstdc++-v3/include/std/mutex | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex index 25e580c..f96c48e 100644 --- a/libstdc++-v3/include/std/mutex +++ b/libstdc++-v3/include/std/mutex @@ -706,6 +706,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool _M_activate(); // Must be called to complete an active execution. + // The argument is true if the active execution was a returning execution, + // false if it was an exceptional execution. void _M_finish(bool __returning) noexcept; // RAII helper to call _M_finish. @@ -742,18 +744,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline bool once_flag::_M_activate() { - if (_M_once == _Bits::_Init) + if (_M_once == _Bits::_Init) [[__likely__]] { _M_once = _Bits::_Active; return true; } - else if (!_M_passive()) + else if (_M_passive()) // Caller should have checked this already. + return false; + else __throw_system_error(EDEADLK); } inline void - once_flag::_M_finish(bool returning) noexcept - { _M_once = returning ? _Bits::_Done : _Bits::_Init; } + once_flag::_M_finish(bool __returning) noexcept + { _M_once = __returning ? _Bits::_Done : _Bits::_Init; } #elif defined _GLIBCXX_HAVE_LINUX_FUTEX |