FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Fix exception thrown by std::shared_lock::unlock() [PR112089]

Browse source 
The incorrect errc constant here looks like a copy&paste error.

libstdc++-v3/ChangeLog:

	PR libstdc++/112089
	* include/std/shared_mutex (shared_lock::unlock): Change errc
	constant to operation_not_permitted.
	* testsuite/30_threads/shared_lock/locking/112089.cc: New test.
This commit is contained in:
Jonathan Wakely 2023-10-26 16:51:30 +01:00
parent 7d06b29f81
commit 0c305f3dec
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libstdc++-v3/include/std/shared_mutex
View file

@ -820,7 +820,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
unlock()
{
if (!_M_owns)
__throw_system_error(int(errc::resource_deadlock_would_occur));
__throw_system_error(int(errc::operation_not_permitted));
_M_pm->unlock_shared();
_M_owns = false;
}

23
libstdc++-v3/testsuite/30_threads/shared_lock/locking/112089.cc Normal file
View file

@ -0,0 +1,23 @@
// { dg-do run { target c++14 } }
// { dg-require-gthreads "" }
// { dg-additional-options "-pthread" { target pthread } }
#include <shared_mutex>
#include <system_error>
#include <testsuite_hooks.h>
// PR libstdc++/112089 shared_lock::unlock should throw operation_not_permitted
int main()
{
std::shared_lock<std::shared_timed_mutex> l;
try
{
l.unlock();
VERIFY( false );
}
catch (const std::system_error& e)
{
VERIFY( e.code() == std::errc::operation_not_permitted );
}
}