From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 758213857428 for ; Mon, 22 Aug 2022 21:53:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 758213857428 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-482-V8739xPNMMC_ZWfEjeAKqA-1; Mon, 22 Aug 2022 17:53:23 -0400 X-MC-Unique: V8739xPNMMC_ZWfEjeAKqA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DD5EA811E84; Mon, 22 Aug 2022 21:53:22 +0000 (UTC) Received: from localhost (unknown [10.33.36.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id A817B1121314; Mon, 22 Aug 2022 21:53:22 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix for explicit copy ctors in and [PR106695] Date: Mon, 22 Aug 2022 22:53:22 +0100 Message-Id: <20220822215322.92997-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE, URI_HEX autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Aug 2022 21:53:27 -0000 Tested powerpc64le-linux, pushed to trunk. Needs backporting. -- >8 -- When I changed std::thread and std::async to avoid unnecessary move construction of temporaries, I introduced a regression where types with an explicit copy constructor could not be passed to std::thread or std::async. The fix is to add a constructor instead of using aggregate initialization of an unnamed temporary. libstdc++-v3/ChangeLog: PR libstdc++/106695 * include/bits/std_thread.h (thread::_State_impl): Forward individual arguments to _Invoker constructor. (thread::_Invoker): Add constructor. Delete copies. * include/std/future (__future_base::_Deferred_state): Forward individual arguments to _Invoker constructor. (__future_base::_Async_state_impl): Likewise. * testsuite/30_threads/async/106695.cc: New test. * testsuite/30_threads/thread/106695.cc: New test. --- libstdc++-v3/include/bits/std_thread.h | 8 ++++- libstdc++-v3/include/std/future | 4 +-- .../testsuite/30_threads/async/106695.cc | 29 +++++++++++++++++++ .../testsuite/30_threads/thread/106695.cc | 21 ++++++++++++++ 4 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 libstdc++-v3/testsuite/30_threads/async/106695.cc create mode 100644 libstdc++-v3/testsuite/30_threads/thread/106695.cc diff --git a/libstdc++-v3/include/bits/std_thread.h b/libstdc++-v3/include/bits/std_thread.h index d7fc0123564..3a7db12c6ba 100644 --- a/libstdc++-v3/include/bits/std_thread.h +++ b/libstdc++-v3/include/bits/std_thread.h @@ -227,7 +227,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template _State_impl(_Args&&... __args) - : _M_func{{std::forward<_Args>(__args)...}} + : _M_func(std::forward<_Args>(__args)...) { } void @@ -261,6 +261,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template struct _Invoker { + template + explicit + _Invoker(_Args&&... __args) + : _M_t(std::forward<_Args>(__args)...) + { } + _Tuple _M_t; template diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index a925d03d19c..ba1f28c6c75 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -1681,7 +1681,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION explicit _Deferred_state(_Args&&... __args) : _M_result(new _Result<_Res>()), - _M_fn{{std::forward<_Args>(__args)...}} + _M_fn(std::forward<_Args>(__args)...) { } private: @@ -1748,7 +1748,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION explicit _Async_state_impl(_Args&&... __args) : _M_result(new _Result<_Res>()), - _M_fn{{std::forward<_Args>(__args)...}} + _M_fn(std::forward<_Args>(__args)...) { _M_thread = std::thread{&_Async_state_impl::_M_run, this}; } diff --git a/libstdc++-v3/testsuite/30_threads/async/106695.cc b/libstdc++-v3/testsuite/30_threads/async/106695.cc new file mode 100644 index 00000000000..74996342dc7 --- /dev/null +++ b/libstdc++-v3/testsuite/30_threads/async/106695.cc @@ -0,0 +1,29 @@ +// { dg-do compile { target c++11 } } +// { dg-require-gthreads "" } + +// PR libstdc++/106695 +// Explicit copy constructor does not work for a parameter passed via std::async + +#include + +struct A { + A() = default; + explicit A(const A&) = default; +}; + +void func(const A&) { } + +void +test_async() +{ + (void) std::async(std::launch::async, func, A{}); + (void) std::async(std::launch::deferred, func, A{}); + (void) std::async(func, A{}); +} + +void +test_task() +{ + std::packaged_task task(func); + task(A{}); +} diff --git a/libstdc++-v3/testsuite/30_threads/thread/106695.cc b/libstdc++-v3/testsuite/30_threads/thread/106695.cc new file mode 100644 index 00000000000..97e9e922d8e --- /dev/null +++ b/libstdc++-v3/testsuite/30_threads/thread/106695.cc @@ -0,0 +1,21 @@ +// { dg-do compile { target c++11 } } +// { dg-require-gthreads "" } + +// PR libstdc++/106695 +// Explicit copy constructor does not work for a parameter passed via std::async + +#include + +struct A { + A() = default; + explicit A(const A&) = default; +}; + +void func(const A&) { } + +void +test_thread() +{ + std::thread t(func, A{}); + t.join(); +} -- 2.37.2