public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-843] libstdc++: Fix std::jthread assertion and re-enable skipped test Date: Mon, 17 May 2021 17:11:42 +0000 (GMT) [thread overview] Message-ID: <20210517171142.F38FB3847839@sourceware.org> (raw) https://gcc.gnu.org/g:60a156ae53e976dfe44689f7c89e607596e7cf67 commit r12-843-g60a156ae53e976dfe44689f7c89e607596e7cf67 Author: Jonathan Wakely <jwakely@redhat.com> Date: Mon May 17 14:55:22 2021 +0100 libstdc++: Fix std::jthread assertion and re-enable skipped test libstdc++-v3/ChangeLog: * include/std/thread (jthread::_S_create): Fix static assert message. * testsuite/30_threads/jthread/95989.cc: Re-enable test. * testsuite/30_threads/jthread/jthread.cc: Do not require pthread effective target. * testsuite/30_threads/jthread/2.cc: Moved to... * testsuite/30_threads/jthread/version.cc: ...here. Diff: --- libstdc++-v3/include/std/thread | 2 +- libstdc++-v3/testsuite/30_threads/jthread/95989.cc | 1 - libstdc++-v3/testsuite/30_threads/jthread/jthread.cc | 4 ++-- libstdc++-v3/testsuite/30_threads/jthread/{2.cc => version.cc} | 0 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/std/thread b/libstdc++-v3/include/std/thread index 886994c1320..f51392ab42c 100644 --- a/libstdc++-v3/include/std/thread +++ b/libstdc++-v3/include/std/thread @@ -219,7 +219,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { static_assert(is_invocable_v<decay_t<_Callable>, decay_t<_Args>...>, - "std::thread arguments must be invocable after" + "std::jthread arguments must be invocable after" " conversion to rvalues"); return thread{std::forward<_Callable>(__f), std::forward<_Args>(__args)...}; diff --git a/libstdc++-v3/testsuite/30_threads/jthread/95989.cc b/libstdc++-v3/testsuite/30_threads/jthread/95989.cc index 53f90827f2e..fb3f43bc722 100644 --- a/libstdc++-v3/testsuite/30_threads/jthread/95989.cc +++ b/libstdc++-v3/testsuite/30_threads/jthread/95989.cc @@ -20,7 +20,6 @@ // { dg-require-gthreads {} } // { dg-additional-options "-pthread" { target pthread } } // { dg-additional-options "-static" { target static } } -// { dg-skip-if "broken" { *-*-* } } #include <thread> diff --git a/libstdc++-v3/testsuite/30_threads/jthread/jthread.cc b/libstdc++-v3/testsuite/30_threads/jthread/jthread.cc index 6adc4981175..799787088ac 100644 --- a/libstdc++-v3/testsuite/30_threads/jthread/jthread.cc +++ b/libstdc++-v3/testsuite/30_threads/jthread/jthread.cc @@ -16,9 +16,9 @@ // <http://www.gnu.org/licenses/>. // { dg-options "-std=gnu++2a -pthread" } -// { dg-add-options libatomic } // { dg-do run { target c++2a } } -// { dg-require-effective-target pthread } +// { dg-add-options libatomic } +// { dg-additional-options "-pthread" { target pthread } } // { dg-require-gthreads "" } #include <thread> diff --git a/libstdc++-v3/testsuite/30_threads/jthread/2.cc b/libstdc++-v3/testsuite/30_threads/jthread/version.cc similarity index 100% rename from libstdc++-v3/testsuite/30_threads/jthread/2.cc rename to libstdc++-v3/testsuite/30_threads/jthread/version.cc
reply other threads:[~2021-05-17 17:11 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210517171142.F38FB3847839@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).