From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 764A5385842B; Thu, 26 Aug 2021 23:13:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 764A5385842B 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-3173] libstdc++: Add static assertions for std::function requirements X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 5889e842ae4df48ac471c47d6ed72e05041a1db8 X-Git-Newrev: 8cf428bfd3ca967b3d135e311d3e391998a39335 Message-Id: <20210826231304.764A5385842B@sourceware.org> Date: Thu, 26 Aug 2021 23:13:04 +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: Thu, 26 Aug 2021 23:13:04 -0000 https://gcc.gnu.org/g:8cf428bfd3ca967b3d135e311d3e391998a39335 commit r12-3173-g8cf428bfd3ca967b3d135e311d3e391998a39335 Author: Jonathan Wakely Date: Thu Aug 26 13:13:27 2021 +0100 libstdc++: Add static assertions for std::function requirements Add static assertions to std::function, so that more user-friendly diagnostics are given when trying to store a non-copyable target object. These preconditions were added as "Mandates:" by LWG 2447, but I'm committing them separately from implementing that, to allow just this change to be backported more easily. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/std_function.h (function::function(F)): Add static assertions to check constructibility requirements. Diff: --- libstdc++-v3/include/bits/std_function.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libstdc++-v3/include/bits/std_function.h b/libstdc++-v3/include/bits/std_function.h index fb86ff1c5f8..e081cd81ef4 100644 --- a/libstdc++-v3/include/bits/std_function.h +++ b/libstdc++-v3/include/bits/std_function.h @@ -422,6 +422,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION function(_Functor __f) : _Function_base() { + static_assert(is_copy_constructible<_Functor>::value, + "std::function target must be copy-constructible"); + static_assert(is_constructible<_Functor, _Functor>::value, + "std::function target must be constructible from the " + "constructor argument"); + using _My_handler = _Function_handler<_Res(_ArgTypes...), _Functor>; if (_My_handler::_M_not_empty_function(__f))