From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 28 Mar 2017 16:09:49 +0000 (+0100)
Subject: PR libstdc++/80137 use std::nextafter instead of looping
X-Git-Tag: releases/gcc-7.1.0~316
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92d85953a54ab7bf45f49e35cae98253eaf00752;p=thirdparty%2Fgcc.git

PR libstdc++/80137 use std::nextafter instead of looping

	PR libstdc++/80137
	* include/bits/random.tcc (generate_canonical): Use std::nextafter
	or numeric_limits::epsilon() to reduce out-of-range values.
	* testsuite/26_numerics/random/uniform_real_distribution/operators/
	64351.cc: Verify complexity requirement is met.

From-SVN: r246542
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cc7c3fb93de5..b4f7e2b084c8 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
 2017-03-28  Jonathan Wakely  <jwakely@redhat.com>
 
+	PR libstdc++/80137
+	* include/bits/random.tcc (generate_canonical): Use std::nextafter
+	or numeric_limits::epsilon() to reduce out-of-range values.
+	* testsuite/26_numerics/random/uniform_real_distribution/operators/
+	64351.cc: Verify complexity requirement is met.
+
 	* doc/xml/manual/abi.xml: Add xml:id anchor.
 	* doc/xml/manual/using.xml (manual.intro.using.macros): Document
 	_GLIBCXX_RELEASE. Link to new anchor for __GLIBCXX__ notes.
diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc
index 2d5582aff6e4..df05ebea6e9a 100644
--- a/libstdc++-v3/include/bits/random.tcc
+++ b/libstdc++-v3/include/bits/random.tcc
@@ -3323,18 +3323,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       const size_t __m = std::max<size_t>(1UL,
 					  (__b + __log2r - 1UL) / __log2r);
       _RealType __ret;
-      do
+      _RealType __sum = _RealType(0);
+      _RealType __tmp = _RealType(1);
+      for (size_t __k = __m; __k != 0; --__k)
 	{
-	  _RealType __sum = _RealType(0);
-	  _RealType __tmp = _RealType(1);
-	  for (size_t __k = __m; __k != 0; --__k)
-	    {
-	      __sum += _RealType(__urng() - __urng.min()) * __tmp;
-	      __tmp *= __r;
-	    }
-	  __ret = __sum / __tmp;
+	  __sum += _RealType(__urng() - __urng.min()) * __tmp;
+	  __tmp *= __r;
+	}
+      __ret = __sum / __tmp;
+      if (__builtin_expect(__ret >= _RealType(1), 0))
+	{
+#if _GLIBCXX_USE_C99_MATH_TR1
+	  __ret = std::nextafter(_RealType(1), _RealType(0));
+#else
+	  __ret = _RealType(1)
+	    - std::numeric_limits<_RealType>::epsilon() / _RealType(2);
+#endif
 	}
-      while (__builtin_expect(__ret >= _RealType(1), 0));
       return __ret;
     }
 
diff --git a/libstdc++-v3/testsuite/26_numerics/random/uniform_real_distribution/operators/64351.cc b/libstdc++-v3/testsuite/26_numerics/random/uniform_real_distribution/operators/64351.cc
index ddb67e881bd0..229fe9c90d94 100644
--- a/libstdc++-v3/testsuite/26_numerics/random/uniform_real_distribution/operators/64351.cc
+++ b/libstdc++-v3/testsuite/26_numerics/random/uniform_real_distribution/operators/64351.cc
@@ -42,10 +42,18 @@ test02()
   std::mt19937 rng(8890);
   std::seed_seq sequence{0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
   rng.seed(sequence);
-  rng.discard(12 * 629143 + 6);
-  float n =
-    std::generate_canonical<float, std::numeric_limits<float>::digits>(rng);
-  VERIFY( n != 1.f );
+  rng.discard(12 * 629143);
+  std::mt19937 rng2{rng};
+  for (int i = 0; i < 20; ++i)
+  {
+    float n =
+      std::generate_canonical<float, std::numeric_limits<float>::digits>(rng);
+    VERIFY( n != 1.f );
+
+    // PR libstdc++/80137
+    rng2.discard(1);
+    VERIFY( rng == rng2 );
+  }
 }
 
 int