procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: variable template array of unknown bound [PR113638]

Browse source 
When we added variable templates, we didn't extend the VAR_HAD_UNKNOWN_BOUND
handling for class template static data members to handle them as well.

	PR c++/113638

gcc/cp/ChangeLog:

	* cp-tree.h: Adjust comment.
	* pt.cc (instantiate_template): Set VAR_HAD_UNKNOWN_BOUND for
	variable template.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp1y/var-templ-array1.C: New test.
This commit is contained in:
Jason Merrill 2024-02-01 16:54:39 -05:00
parent e0701f8f7b
commit 0b786ff38a
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gcc/cp/cp-tree.h
View file

@ -3251,7 +3251,7 @@ struct GTY(()) lang_decl {
#define DECL_CONV_FN_TYPE(FN) \
TREE_TYPE ((gcc_checking_assert (DECL_CONV_FN_P (FN)), DECL_NAME (FN)))
/* Nonzero if NODE, a static data member, was declared in its class as an
/* Nonzero if NODE, a templated variable, was declared as an
array of unknown bound. */
#define VAR_HAD_UNKNOWN_BOUND(NODE) \
(DECL_LANG_SPECIFIC (VAR_DECL_CHECK (NODE)) \

13
gcc/cp/pt.cc
View file

@ -22105,9 +22105,16 @@ instantiate_template (tree tmpl, tree orig_args, tsubst_flags_t complain)
DECL_TI_TEMPLATE (fndecl) = tmpl;
DECL_TI_ARGS (fndecl) = targ_ptr;
if (VAR_P (pattern))
/* Now that we we've formed this variable template specialization,
remember the result of most_specialized_partial_spec for it. */
TI_PARTIAL_INFO (DECL_TEMPLATE_INFO (fndecl)) = partial_ti;
{
/* Now that we we've formed this variable template specialization,
remember the result of most_specialized_partial_spec for it. */
TI_PARTIAL_INFO (DECL_TEMPLATE_INFO (fndecl)) = partial_ti;
/* And remember if the variable was declared with []. */
if (TREE_CODE (TREE_TYPE (fndecl)) == ARRAY_TYPE
&& TYPE_DOMAIN (TREE_TYPE (fndecl)) == NULL_TREE)
SET_VAR_HAD_UNKNOWN_BOUND (fndecl);
}
fndecl = register_specialization (fndecl, gen_tmpl, targ_ptr, false, hash);
if (fndecl == error_mark_node)

7
gcc/testsuite/g++.dg/cpp1y/var-templ-array1.C Normal file
View file

@ -0,0 +1,7 @@
// PR c++/113638
// { dg-do compile { target c++14 } }
template<int ...Is>
constexpr int my_array[]{Is...};
constexpr auto t1 = my_array<2>;
static_assert(sizeof(my_array<1>) == sizeof(int) * 1, "");