From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 339FC3857C61; Sun, 20 Sep 2020 23:17:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 339FC3857C61 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1600643836; bh=qcfwjVT+oBA4OdBQbosjCWe8pNhXWfEGBO0b84N05Gw=; h=From:To:Subject:Date:From; b=k/M6z28u/Be+UcQk2eBIguufLwbK1c0dnQ5PikHgHZbt3kTQBnWMalLZABhfL4qjW ZfGSpjQ52kYbp6nFa9qyGLuISLnuVuSPcCNMUnSAUZvEMcvgMcrkzEpyz0RUJ2NU6D uhYeNgKi9CLG8GZ4Q2d+/bsNVpj71UQrxiD64jqg= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-3312] libstdc++: Fix noexcept-specifier for std::bind_front [PR 97101] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 363e7755f227656684c8e284307ceee451503ca4 X-Git-Newrev: 3c755b428e188228d0bad90625c995fd25a02322 Message-Id: <20200920231716.339FC3857C61@sourceware.org> Date: Sun, 20 Sep 2020 23:17:16 +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: Sun, 20 Sep 2020 23:17:16 -0000 https://gcc.gnu.org/g:3c755b428e188228d0bad90625c995fd25a02322 commit r11-3312-g3c755b428e188228d0bad90625c995fd25a02322 Author: Jonathan Wakely Date: Mon Sep 21 00:17:02 2020 +0100 libstdc++: Fix noexcept-specifier for std::bind_front [PR 97101] libstdc++-v3/ChangeLog: PR libstdc++/97101 * include/std/functional (bind_front): Fix order of parameters in is_nothrow_constructible_v specialization. * testsuite/20_util/function_objects/bind_front/97101.cc: New test. Diff: --- libstdc++-v3/include/std/functional | 4 +-- .../20_util/function_objects/bind_front/97101.cc | 41 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 124bdadd4c7..407b93f3eb7 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -905,8 +905,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template constexpr _Bind_front_t<_Fn, _Args...> bind_front(_Fn&& __fn, _Args&&... __args) - noexcept(is_nothrow_constructible_v, - _Fn, _Args...>) + noexcept(is_nothrow_constructible_v<_Bind_front_t<_Fn, _Args...>, + int, _Fn, _Args...>) { return _Bind_front_t<_Fn, _Args...>(0, std::forward<_Fn>(__fn), std::forward<_Args>(__args)...); diff --git a/libstdc++-v3/testsuite/20_util/function_objects/bind_front/97101.cc b/libstdc++-v3/testsuite/20_util/function_objects/bind_front/97101.cc new file mode 100644 index 00000000000..b159eb02591 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/function_objects/bind_front/97101.cc @@ -0,0 +1,41 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++2a" } +// { dg-do compile { target c++2a } } + +#include + +void +test01() +{ + struct F1 + { + void operator()() { } + }; + + struct F2 + { + F2() = default; + F2(const F2&) noexcept(false) { } + void operator()() { } + }; + + // PR libstdc++/97101 + static_assert( noexcept(std::bind_front(F1{})) ); + static_assert( ! noexcept(std::bind_front(F2{})) ); +}