]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Add assertions for preconditions in sampling distributions [PR 82584]
authorJonathan Wakely <jwakely@redhat.com>
Thu, 8 Oct 2020 14:14:58 +0000 (15:14 +0100)
committerJonathan Wakely <jwakely@redhat.com>
Thu, 8 Oct 2020 14:24:21 +0000 (15:24 +0100)
These three distributions all require 0 < S where S is the sum of the
weights. When the sum is zero there's an undefined FP division by zero.
Add assertions to help users diagnose the problem.

libstdc++-v3/ChangeLog:

PR libstdc++/82584
* include/bits/random.tcc
(discrete_distribution::param_type::_M_initialize)
(piecewise_constant_distribution::param_type::_M_initialize)
(piecewise_linear_distribution::param_type::_M_initialize):
Add assertions for positive sums..
* testsuite/26_numerics/random/pr60037-neg.cc: Adjust dg-error
line.

libstdc++-v3/include/bits/random.tcc
libstdc++-v3/testsuite/26_numerics/random/pr60037-neg.cc

index f67b2fe48f44373f8d8a0848cecc8a99b20b06e8..a921b9bf815c9ee8f852ff0c06283d86178e4dc9 100644 (file)
@@ -2630,6 +2630,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
       const double __sum = std::accumulate(_M_prob.begin(),
                                           _M_prob.end(), 0.0);
+      __glibcxx_assert(__sum > 0);
       // Now normalize the probabilites.
       __detail::__normalize(_M_prob.begin(), _M_prob.end(), _M_prob.begin(),
                            __sum);
@@ -2794,6 +2795,7 @@ namespace __detail
 
       const double __sum = std::accumulate(_M_den.begin(),
                                           _M_den.end(), 0.0);
+      __glibcxx_assert(__sum > 0);
 
       __detail::__normalize(_M_den.begin(), _M_den.end(), _M_den.begin(),
                            __sum);
@@ -3016,6 +3018,7 @@ namespace __detail
          _M_cp.push_back(__sum);
          _M_m.push_back((_M_den[__k + 1] - _M_den[__k]) / __delta);
        }
+      __glibcxx_assert(__sum > 0);
 
       //  Now normalize the densities...
       __detail::__normalize(_M_den.begin(), _M_den.end(), _M_den.begin(),
index 139abbb305186a8ffdc8b0712b8a2d75cf423a32..9cffc3d06f9342fd636e26ed9046d91701a253a9 100644 (file)
@@ -12,4 +12,4 @@ auto x = std::generate_canonical<std::size_t,
 
 // { dg-error "static assertion failed: template argument must be a floating point type" "" { target *-*-* } 167 }
 
-// { dg-error "static assertion failed: template argument must be a floating point type" "" { target *-*-* } 3281 }
+// { dg-error "static assertion failed: template argument must be a floating point type" "" { target *-*-* } 3284 }