summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2022-09-21 14:59:18 +0100
committerJonathan Wakely <jwakely@redhat.com>2022-09-21 15:01:37 +0100
commit5814816641389dd76153aae63e8ccb67a1a9a321 (patch)
tree9be44a7b47d97486dd547b8e638b19c60d1e0200
parent16fe325a43274cbab2332ef1c60b9c1ff85db6ef (diff)
downloadgcc-5814816641389dd76153aae63e8ccb67a1a9a321.tar.gz
libstdc++: Fix accidental duplicate test [PR91456]
It looks like I committed the testcase for std::function twice, instead of one for std::function and one for std::is_invocable_r. This replaces the is_invocable_r one with the example from the PR. libstdc++-v3/ChangeLog: PR libstdc++/91456 * testsuite/20_util/function/91456.cc: Add comment with PR number. * testsuite/20_util/is_invocable/91456.cc: Likewise. Replace std::function checks with std::is_invocable_r checks.
-rw-r--r--libstdc++-v3/testsuite/20_util/function/91456.cc3
-rw-r--r--libstdc++-v3/testsuite/20_util/is_invocable/91456.cc10
2 files changed, 9 insertions, 4 deletions
diff --git a/libstdc++-v3/testsuite/20_util/function/91456.cc b/libstdc++-v3/testsuite/20_util/function/91456.cc
index 6b6631c452d..081bf20e2cf 100644
--- a/libstdc++-v3/testsuite/20_util/function/91456.cc
+++ b/libstdc++-v3/testsuite/20_util/function/91456.cc
@@ -17,6 +17,9 @@
// { dg-do compile { target c++17 } }
+// PR 91456
+// std::function and std::is_invocable_r do not understand guaranteed elision
+
#include <functional>
struct Immovable {
diff --git a/libstdc++-v3/testsuite/20_util/is_invocable/91456.cc b/libstdc++-v3/testsuite/20_util/is_invocable/91456.cc
index a946db15c55..976d257ce85 100644
--- a/libstdc++-v3/testsuite/20_util/is_invocable/91456.cc
+++ b/libstdc++-v3/testsuite/20_util/is_invocable/91456.cc
@@ -17,6 +17,9 @@
// { dg-do compile { target c++17 } }
+// PR 91456
+// std::function and std::is_invocable_r do not understand guaranteed elision
+
#include <type_traits>
#include <functional>
@@ -27,7 +30,6 @@ struct Immovable {
Immovable& operator=(const Immovable&) = delete;
};
-Immovable get() { return {}; }
-const Immovable i = get(); // OK
-std::function<const Immovable()> f{&get}; // fails
-const Immovable i2 = f();
+static_assert(std::is_invocable_r_v<Immovable, Immovable(*)()>);
+static_assert(std::is_invocable_r_v<const Immovable, Immovable(*)()>);
+static_assert(std::is_invocable_r_v<Immovable, const Immovable(*)()>);