aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2022-09-14 14:03:19 +0100
committerJonathan Wakely <jwakely@redhat.com>2022-09-14 19:17:36 +0100
commit0bc9aa9c3fcb1f3534575314038661ff111874dd (patch)
treee3262c029e392a5547e1904c68090c1d868e9066
parent8b1bc3051bd68ce193a8612fa3b1a65c0353b5b0 (diff)
downloadgcc-0bc9aa9c3fcb1f3534575314038661ff111874dd.zip
gcc-0bc9aa9c3fcb1f3534575314038661ff111874dd.tar.gz
gcc-0bc9aa9c3fcb1f3534575314038661ff111874dd.tar.bz2
libstdc++: Add assertion to std::promise::set_exception (LWG 2276)
Without this assertion, the shared state is made ready, but contains neither a value nor an exception. Add an assertion to prevent users from accessing a value that was never initialized in the shared state. libstdc++-v3/ChangeLog: * include/std/future (_State_baseV2::__setter(exception_ptr&, promise&)): Add assertion for LWG 2276 precondition. * testsuite/30_threads/promise/members/set_exception_neg.cc: New test.
-rw-r--r--libstdc++-v3/include/std/future1
-rw-r--r--libstdc++-v3/testsuite/30_threads/promise/members/set_exception_neg.cc18
2 files changed, 19 insertions, 0 deletions
diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future
index ba1f28c..a1b2d7f 100644
--- a/libstdc++-v3/include/std/future
+++ b/libstdc++-v3/include/std/future
@@ -559,6 +559,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static _Setter<_Res, __exception_ptr_tag>
__setter(exception_ptr& __ex, promise<_Res>* __prom) noexcept
{
+ __glibcxx_assert(__ex != nullptr); // LWG 2276
return _Setter<_Res, __exception_ptr_tag>{ __prom, &__ex };
}
diff --git a/libstdc++-v3/testsuite/30_threads/promise/members/set_exception_neg.cc b/libstdc++-v3/testsuite/30_threads/promise/members/set_exception_neg.cc
new file mode 100644
index 0000000..1666093
--- /dev/null
+++ b/libstdc++-v3/testsuite/30_threads/promise/members/set_exception_neg.cc
@@ -0,0 +1,18 @@
+// { dg-options "-D_GLIBCXX_ASSERTIONS" }
+// { dg-do run { xfail *-*-* } }
+// { dg-additional-options "-pthread" { target pthread } }
+// { dg-require-effective-target c++11 }
+// { dg-require-gthreads "" }
+
+// LWG 2276. Missing requirement on std::promise::set_exception
+
+#include <future>
+
+int main()
+{
+ std::promise<void> prom;
+ auto f = prom.get_future();
+ std::exception_ptr p;
+ prom.set_exception(p); // Preconditions: p is not null
+ f.get();
+}