OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Fix deserialization for std::normal_distribution [PR105502]

Browse Source 
This fixes a regression in std::normal_distribution deserialization that
caused the object to be left unchanged if the __state_avail value read
from the stream was false.

libstdc++-v3/ChangeLog:

	PR libstdc++/105502
	* include/bits/random.tcc
	(operator>>(basic_istream<C,T>&, normal_distribution<R>&)):
	Update state when __state_avail is false.
	* testsuite/26_numerics/random/normal_distribution/operators/serialize.cc:
	Check that deserialized object equals serialized one.

(cherry picked from commit 909ef4e272)
This commit is contained in:
Jonathan Wakely 2022-05-06 21:19:17 +01:00
parent e6b1ac334a
commit 03257e7ee3
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libstdc++-v3/include/bits/random.tcc
View File

@ -1961,7 +1961,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
bool __saved_avail;
if (__is >> __mean >> __stddev >> __saved_avail)
{
if (__saved_avail && (__is >> __x._M_saved))
if (!__saved_avail || (__is >> __x._M_saved))
{
__x._M_saved_available = __saved_avail;
__x.param(param_type(__mean, __stddev));

36
libstdc++-v3/testsuite/26_numerics/random/normal_distribution/operators/serialize.cc
View File

@ -25,6 +25,7 @@
#include <random>
#include <sstream>
#include <testsuite_hooks.h>
void
test01()
@ -37,10 +38,43 @@ test01()
str << u;
str >> v;
VERIFY( u == v );
}
void
test_pr105502()
{
// PR libstdc++/105502 std::normal_distribution deserialization issue
std::stringstream str;
std::normal_distribution<> d{1, 2}, d2;
std::minstd_rand0 g;
str << d;
VERIFY( str );
str >> d2;
VERIFY( str );
VERIFY( d == d2 );
(void) d(g); // sets d._M_saved_available = true
str.str("");
str.clear();
str << d;
VERIFY( str );
str >> d2;
VERIFY( str );
VERIFY( d == d2 );
(void) d(g); // sets d._M_saved_available = false
str.str("");
str.clear();
str << d;
VERIFY( str );
str >> d2;
VERIFY( str );
VERIFY( d == d2 );
}
int main()
{
test01();
return 0;
test_pr105502();
}