c++: __integer_pack with class argument [PR111357]

The argument might not already be an integer.

	PR c++/111357

gcc/cp/ChangeLog:

	* pt.cc (expand_integer_pack): Convert argument to int.

gcc/testsuite/ChangeLog:

	* g++.dg/ext/integer-pack7.C: New test.
This commit is contained in:
Jason Merrill 2023-09-11 09:40:32 -04:00
parent ea5abbb263
commit f73d2d61a5
2 changed files with 40 additions and 0 deletions

View file

@ -3793,6 +3793,8 @@ expand_integer_pack (tree call, tree args, tsubst_flags_t complain,
}
else
{
hi = perform_implicit_conversion_flags (integer_type_node, hi, complain,
LOOKUP_IMPLICIT);
hi = instantiate_non_dependent_expr (hi, complain);
hi = cxx_constant_value (hi, complain);
int len = valid_constant_size_p (hi) ? tree_to_shwi (hi) : -1;

View file

@ -0,0 +1,38 @@
// PR c++/111357
// { dg-do compile { target c++11 } }
namespace std {
template<typename _Tp, _Tp... _Idx>
struct integer_sequence
{ };
template<typename _Tp, _Tp _Num>
using make_integer_sequence
= integer_sequence<_Tp, __integer_pack(_Num)...>;
}
using std::integer_sequence;
using std::make_integer_sequence;
template<int... V>
void g(integer_sequence<int,V...>)
{}
template<typename ...T>
struct c1
{
static constexpr int value = 1;
constexpr operator int() { return value; }
};
template<typename T>
struct R
{
using S = make_integer_sequence<int,c1<T>{}>;
R() noexcept(noexcept(g(S())))
{}
};
int main()
{
R<int>();
}