From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 2676A385841F; Mon, 18 Mar 2024 14:06:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2676A385841F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1710770776; bh=h+n7YG+C3A6UmCBMjxJQbv9tQMWtF7Mg8EZDLqi3mnU=; h=From:To:Subject:Date:From; b=amvglvKcsVWjGP0gqn5vyiHQT9RgRMH5DGKrDMhU245QOmpvLEiUYs6s+cdL/rTKE KKo+BNfnqHG7/i4MrsZQ+CahpM7CoJ8X4nTskRluT1le+43EtmKBRXHMjRpTx2H221 +CNEzX8322LJgP/Z5gigq/SSYzR7jh9q9ZZUWDDg= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-10254] libstdc++: Add static_assert to std::integer_sequence [PR112473] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 15c517049c0d8b6319990445939a69bb36fdc678 X-Git-Newrev: dc0964f43dcee46dcd1843287a541668fd08a4a8 Message-Id: <20240318140616.2676A385841F@sourceware.org> Date: Mon, 18 Mar 2024 14:06:16 +0000 (GMT) List-Id: https://gcc.gnu.org/g:dc0964f43dcee46dcd1843287a541668fd08a4a8 commit r12-10254-gdc0964f43dcee46dcd1843287a541668fd08a4a8 Author: Jonathan Wakely Date: Fri Nov 10 12:21:52 2023 +0000 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. (cherry picked from commit 0953497a81f1e320989b9f2aaa7f56747eddd4a0) Diff: --- libstdc++-v3/include/bits/utility.h | 3 +++ libstdc++-v3/testsuite/20_util/integer_sequence/112473.cc | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/libstdc++-v3/include/bits/utility.h b/libstdc++-v3/include/bits/utility.h index 180866e3581..6483a8e537e 100644 --- a/libstdc++-v3/include/bits/utility.h +++ b/libstdc++-v3/include/bits/utility.h @@ -163,6 +163,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template 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 00000000000..14abfbc8149 --- /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 + +std::integer_sequence, std::pair{0, 0}> ic; +// { dg-error "static assertion failed" "" { target *-*-* } 0 }