On 08/10/18 12:59 +0100, Jonathan Wakely wrote:
PR libstdc++/87538
* include/std/functional (_Not_fn::operator()): Check value of
__is_nothrow_invocable as well.
* testsuite/20_util/function_objects/not_fn/87538.cc: New test.
Tested x86_64-linux, committed to trunk.
I'll backport this to gcc-7 and gcc-8 too.
Here's a testcase to verify the regression for
std::experimental::not_fn is fixed.
Tested x86_64-linux, committed to trunk.
commit 0bd818b99a532b88da0daa9632054cdc6ba7953a
Author: Jonathan Wakely <jwak...@redhat.com>
Date: Mon Oct 8 13:15:21 2018 +0100
PR libstdc++/87538 Verify fix for std::experimental::not_fn
PR libstdc++/87538
* testsuite/experimental/functional/87538.cc: New test.
diff --git a/libstdc++-v3/testsuite/experimental/functional/87538.cc b/libstdc++-v3/testsuite/experimental/functional/87538.cc
new file mode 100644
index 00000000000..1ee9ecd55f3
--- /dev/null
+++ b/libstdc++-v3/testsuite/experimental/functional/87538.cc
@@ -0,0 +1,48 @@
+// Copyright (C) 2018 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
+// <http://www.gnu.org/licenses/>.
+
+// { dg-do run { target c++14 } }
+
+#include <experimental/functional>
+#include <testsuite_hooks.h>
+
+struct N {
+ int operator()(int i) { if (i == 0) throw -1; return i; }
+};
+
+void
+test01()
+{
+ N n;
+ auto not_n = std::experimental::not_fn(n);
+ static_assert( !noexcept(not_n(1)), "can throw" );
+ VERIFY(not_n(1) == 0);
+ int exception = 0;
+ try {
+ not_n(0);
+ }
+ catch (int e) {
+ exception = e;
+ }
+ VERIFY(exception == -1);
+}
+
+int
+main()
+{
+ test01();
+}
