From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 6DF553858D39; Tue, 19 Oct 2021 10:50:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6DF553858D39 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-4500] libstdc++: Fix mem-initializer in std::move_only_function [PR102825] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 476ca5ade8522d566ffffeab0bece6a64aefeecd X-Git-Newrev: 9890b12c72c02828c691f22198c3e0afd8678991 Message-Id: <20211019105051.6DF553858D39@sourceware.org> Date: Tue, 19 Oct 2021 10:50:51 +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: Tue, 19 Oct 2021 10:50:51 -0000 https://gcc.gnu.org/g:9890b12c72c02828c691f22198c3e0afd8678991 commit r12-4500-g9890b12c72c02828c691f22198c3e0afd8678991 Author: Jonathan Wakely Date: Tue Oct 19 09:16:56 2021 +0100 libstdc++: Fix mem-initializer in std::move_only_function [PR102825] libstdc++-v3/ChangeLog: PR libstdc++/102825 * include/bits/mofunc_impl.h (move_only_function): Remove invalid base initializer. * testsuite/20_util/move_only_function/cons.cc: Instantiate constructors to check bodies. Diff: --- libstdc++-v3/include/bits/mofunc_impl.h | 2 +- .../testsuite/20_util/move_only_function/cons.cc | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/mofunc_impl.h b/libstdc++-v3/include/bits/mofunc_impl.h index 543c6f547b7..968d235f867 100644 --- a/libstdc++-v3/include/bits/mofunc_impl.h +++ b/libstdc++-v3/include/bits/mofunc_impl.h @@ -108,7 +108,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION move_only_function(in_place_type_t<_Tp>, initializer_list<_Up> __il, _Args&&... __args) noexcept(_S_nothrow_init<_Tp, initializer_list<_Up>&, _Args...>()) - : _Mofunc_base(nullptr), _M_invoke(&_S_invoke<_Tp>) + : _M_invoke(&_S_invoke<_Tp>) { static_assert(is_same_v, _Tp>); _M_init<_Tp>(__il, std::forward<_Args>(__args)...); diff --git a/libstdc++-v3/testsuite/20_util/move_only_function/cons.cc b/libstdc++-v3/testsuite/20_util/move_only_function/cons.cc index 0992f107003..d8a0a4ab2b0 100644 --- a/libstdc++-v3/testsuite/20_util/move_only_function/cons.cc +++ b/libstdc++-v3/testsuite/20_util/move_only_function/cons.cc @@ -96,3 +96,30 @@ static_assert( ! is_nothrow_constructible_v, in_place_type_t, int> ); static_assert( is_nothrow_constructible_v, in_place_type_t, int, int> ); + +struct I { + I(int, const char*); + I(std::initializer_list); + int operator()() const noexcept; +}; + +static_assert( is_constructible_v, + std::in_place_type_t, + int, const char*> ); +static_assert( is_constructible_v, + std::in_place_type_t, + std::initializer_list> ); + +void +test_instantiation() +{ + // Instantiate the constructor bodies + move_only_function f0; + move_only_function f1(nullptr); + move_only_function f2( I(1, "two") ); + move_only_function f3(std::in_place_type, 3, "four"); + move_only_function f4(std::in_place_type, // PR libstdc++/102825 + { 'P', 'R', '1', '0', '2', '8', '2', '5'}); + auto f5 = std::move(f4); + f4 = std::move(f5); +}