aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2023-11-10 12:21:52 +0000
committerJonathan Wakely <jwakely@redhat.com>2023-11-11 00:41:09 +0000
commit0953497a81f1e320989b9f2aaa7f56747eddd4a0 (patch)
treee366825c4646108dbd695fcbd1d3d781f321bc84
parent94cc8e9d6f9f186d5fb1ca68fdf55e3c8090f3f6 (diff)
downloadgcc-0953497a81f1e320989b9f2aaa7f56747eddd4a0.zip
gcc-0953497a81f1e320989b9f2aaa7f56747eddd4a0.tar.gz
gcc-0953497a81f1e320989b9f2aaa7f56747eddd4a0.tar.bz2
libstdc++: Add static_assert to std::integer_sequence [PR112473]
C++20 allows class types as non-type template parameters, but std::integer_sequence explicitly disallows them. Enforce that. libstdc++-v3/ChangeLog: PR libstdc++/112473 * include/bits/utility.h (integer_sequence): Add static_assert. * testsuite/20_util/integer_sequence/112473.cc: New test.
-rw-r--r--libstdc++-v3/include/bits/utility.h3
-rw-r--r--libstdc++-v3/testsuite/20_util/integer_sequence/112473.cc8
2 files changed, 11 insertions, 0 deletions
diff --git a/libstdc++-v3/include/bits/utility.h b/libstdc++-v3/include/bits/utility.h
index 8766dfb..ebcf5ba 100644
--- a/libstdc++-v3/include/bits/utility.h
+++ b/libstdc++-v3/include/bits/utility.h
@@ -166,6 +166,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp, _Tp... _Idx>
struct integer_sequence
{
+#if __cplusplus >= 202002L
+ static_assert(is_integral_v<_Tp>);
+#endif
typedef _Tp value_type;
static constexpr size_t size() noexcept { return sizeof...(_Idx); }
};
diff --git a/libstdc++-v3/testsuite/20_util/integer_sequence/112473.cc b/libstdc++-v3/testsuite/20_util/integer_sequence/112473.cc
new file mode 100644
index 0000000..14abfbc
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/integer_sequence/112473.cc
@@ -0,0 +1,8 @@
+// { dg-do compile { target c++20 } }
+
+// PR libstdc++/112473 - integer_sequence accepts non-integer types
+
+#include <utility>
+
+std::integer_sequence<std::pair<int, int>, std::pair<int, int>{0, 0}> ic;
+// { dg-error "static assertion failed" "" { target *-*-* } 0 }