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

c++: using non-dep array var of unknown bound [PR115358]

Browse source 
For a non-dependent array variable of unknown bound, it seems we need to
try instantiating its definition upon use in a template context for sake
of proper checking and typing of the overall expression, like we do for
function specializations with deduced return type.

	PR c++/115358

gcc/cp/ChangeLog:

	* decl2.cc (mark_used): Call maybe_instantiate_decl for an array
	variable with unknown bound.
	* semantics.cc (finish_decltype_type): Remove now redundant
	handling of array variables with unknown bound.
	* typeck.cc (cxx_sizeof_expr): Likewise.

gcc/testsuite/ChangeLog:

	* g++.dg/template/array37.C: New test.

Reviewed-by: Jason Merrill <jason@redhat.com>
(cherry picked from commit e3915c1ad56591cbd68229a64c941c38330abd69)
This commit is contained in:
Patrick Palka 2024-06-25 10:42:21 -04:00
parent d5e352addf
commit 33a9c4dd5f
4 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gcc/cp/decl2.cc
View file

@ -5952,6 +5952,8 @@ mark_used (tree decl, tsubst_flags_t complain /* = tf_warning_or_error */)
find out its type. For OpenMP user defined reductions, we need them
instantiated for reduction clauses which inline them by hand directly. */
if (undeduced_auto_decl (decl)
|| (VAR_P (decl)
&& VAR_HAD_UNKNOWN_BOUND (decl))
|| (TREE_CODE (decl) == FUNCTION_DECL
&& DECL_OMP_DECLARE_REDUCTION_P (decl)))
maybe_instantiate_decl (decl);

7
gcc/cp/semantics.cc
View file

@ -11835,13 +11835,6 @@ finish_decltype_type (tree expr, bool id_expression_or_member_access_p,
return error_mark_node;
}
/* To get the size of a static data member declared as an array of
unknown bound, we need to instantiate it. */
if (VAR_P (expr)
&& VAR_HAD_UNKNOWN_BOUND (expr)
&& DECL_TEMPLATE_INSTANTIATION (expr))
instantiate_decl (expr, /*defer_ok*/true, /*expl_inst_mem*/false);
if (id_expression_or_member_access_p)
{
/* If e is an id-expression or a class member access (5.2.5

7
gcc/cp/typeck.cc
View file

@ -2128,13 +2128,6 @@ cxx_sizeof_expr (location_t loc, tree e, tsubst_flags_t complain)
location_t e_loc = cp_expr_loc_or_loc (e, loc);
STRIP_ANY_LOCATION_WRAPPER (e);
/* To get the size of a static data member declared as an array of
unknown bound, we need to instantiate it. */
if (VAR_P (e)
&& VAR_HAD_UNKNOWN_BOUND (e)
&& DECL_TEMPLATE_INSTANTIATION (e))
instantiate_decl (e, /*defer_ok*/true, /*expl_inst_mem*/false);
if (TREE_CODE (e) == PARM_DECL
&& DECL_ARRAY_PARAMETER_P (e)
&& (complain & tf_warning))

14
gcc/testsuite/g++.dg/template/array37.C Normal file
View file

@ -0,0 +1,14 @@
// PR c++/115358
template<class T>
struct A { static int STR[]; };
template<class T>
int A<T>::STR[] = {1,2,3};
void f(int(&)[3]);
template<class T>
void g() {
f(A<int>::STR); // { dg-bogus "int []" }
}