aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2021-07-12 16:09:34 +0100
committerJonathan Wakely <jwakely@redhat.com>2021-07-12 18:35:27 +0100
commit9d4393af9d2b37b78eb5b1f84f5d4da3a6f7fba6 (patch)
tree2a130a418f2583104f5ea1523714780cc200cf26
parent3f2338b4706cdc53ab276b9a5fed7f6927404f07 (diff)
downloadgcc-9d4393af9d2b37b78eb5b1f84f5d4da3a6f7fba6.zip
gcc-9d4393af9d2b37b78eb5b1f84f5d4da3a6f7fba6.tar.gz
gcc-9d4393af9d2b37b78eb5b1f84f5d4da3a6f7fba6.tar.bz2
libstdc++: Constrain std::as_writable_bytes [PR101411]
The std::as_writable_bytes function should be constrained to only accept writable spans. Currently it can be called but then gives an error in the function body. Signed-off-by: Jonathan Wakely <jwakely@redhat.com> libstdc++-v3/ChangeLog: PR libstdc++/101411 * include/std/span (as_writable_bytes): Add requires-clause. * testsuite/23_containers/span/101411.cc: New test.
-rw-r--r--libstdc++-v3/include/std/span1
-rw-r--r--libstdc++-v3/testsuite/23_containers/span/101411.cc15
2 files changed, 16 insertions, 0 deletions
diff --git a/libstdc++-v3/include/std/span b/libstdc++-v3/include/std/span
index 63f0a8f..21d8f6a 100644
--- a/libstdc++-v3/include/std/span
+++ b/libstdc++-v3/include/std/span
@@ -425,6 +425,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Type, size_t _Extent>
+ requires (!is_const_v<_Type>)
inline
span<byte, _Extent == dynamic_extent
? dynamic_extent : _Extent * sizeof(_Type)>
diff --git a/libstdc++-v3/testsuite/23_containers/span/101411.cc b/libstdc++-v3/testsuite/23_containers/span/101411.cc
new file mode 100644
index 0000000..05bdd3b
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/span/101411.cc
@@ -0,0 +1,15 @@
+// { dg-options "-std=gnu++20" }
+// { dg-do compile { xfail c++20 } }
+#include <span>
+
+// PR libstdc++/101411
+
+void f(std::span<const int> s)
+{
+ std::as_writable_bytes(s); // { dg-error "no matching function" }
+}
+
+void f1(std::span<const int, 1> s)
+{
+ std::as_writable_bytes(s); // { dg-error "no matching function" }
+}