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

c++: enum in generic lambda in template [PR95317]

Browse source 
Here we weren't instantiating the enumerators because the arglist still had
the template parameter for the generic lambda, so looking one up failed.  We
need to instantiate if the non-lambda enclosing scope is non-dependent.

gcc/cp/ChangeLog:

	PR c++/95317
	* pt.c (lookup_template_class_1): Do tsubst_enum when
	tsubsting a generic lambda.

gcc/testsuite/ChangeLog:

	PR c++/95317
	* g++.dg/cpp1y/lambda-generic-enum1.C: New test.
This commit is contained in:
Jason Merrill 2021-04-05 14:26:03 -04:00
parent 62d60246e5
commit 9f4c41147a
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gcc/cp/pt.c
View file

@ -10173,7 +10173,8 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context,
= tree_cons (arglist, t,
DECL_TEMPLATE_INSTANTIATIONS (found));
if (TREE_CODE (template_type) == ENUMERAL_TYPE && !is_dependent_type
if (TREE_CODE (template_type) == ENUMERAL_TYPE
&& !uses_template_parms (current_nonlambda_scope ())
&& !DECL_ALIAS_TEMPLATE_P (gen_tmpl))
/* Now that the type has been registered on the instantiations
list, we set up the enumerators. Because the enumeration

10
gcc/testsuite/g++.dg/cpp1y/lambda-generic-enum1.C Normal file
View file

@ -0,0 +1,10 @@
// PR c++/95317
// { dg-do compile { target c++14 } }
template <typename> void fn1() {
[](auto) {
enum { VALUE };
VALUE;
};
}
int main() { fn1<void>; }