From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id F38FB3847839; Mon, 17 May 2021 17:11:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F38FB3847839 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely 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 X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: ce81282261c6c77883b17d0ebfbbe337bed76457 X-Git-Newrev: 60a156ae53e976dfe44689f7c89e607596e7cf67 Message-Id: <20210517171142.F38FB3847839@sourceware.org> Date: Mon, 17 May 2021 17:11:42 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 May 2021 17:11:43 -0000 https://gcc.gnu.org/g:60a156ae53e976dfe44689f7c89e607596e7cf67 commit r12-843-g60a156ae53e976dfe44689f7c89e607596e7cf67 Author: Jonathan Wakely 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<_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 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 @@ // . // { 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 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