MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Add missing return and use reserved name

Browse Source 
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.
This commit is contained in:
Jonathan Wakely 2021-02-15 14:00:36 +00:00
parent abe07a74bb
commit d27153f038
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libstdc++-v3/include/std/mutex
View File

@ -706,6 +706,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
bool _M_activate(); bool _M_activate();
// Must be called to complete an active execution. // 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; void _M_finish(bool __returning) noexcept;
// RAII helper to call _M_finish. // RAII helper to call _M_finish.
@ -742,18 +744,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
inline bool inline bool
once_flag::_M_activate() once_flag::_M_activate()
{ {
if (_M_once == _Bits::_Init) if (_M_once == _Bits::_Init) [[__likely__]]
{ {
_M_once = _Bits::_Active; _M_once = _Bits::_Active;
return true; return true;
} }
else if (!_M_passive()) else if (_M_passive()) // Caller should have checked this already.
return false;
else
__throw_system_error(EDEADLK); __throw_system_error(EDEADLK);
} }
inline void inline void
once_flag::_M_finish(bool returning) noexcept once_flag::_M_finish(bool __returning) noexcept
{ _M_once = returning ? _Bits::_Done : _Bits::_Init; } { _M_once = __returning ? _Bits::_Done : _Bits::_Init; }
#elif defined _GLIBCXX_HAVE_LINUX_FUTEX #elif defined _GLIBCXX_HAVE_LINUX_FUTEX