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

PR c++/85228 - ICE with lambda in enumerator.

Browse source 
* pt.c (bt_instantiate_type_proc): Don't assume
	CLASSTYPE_TEMPLATE_INFO is non-null.

From-SVN: r259130
This commit is contained in:
Jason Merrill 2018-04-05 10:48:40 -04:00 • committed by Jason Merrill
parent 9aee04a4c0
commit 4cbe585c99
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2018-04-05 Jason Merrill <jason@redhat.com>
PR c++/85228 - ICE with lambda in enumerator in template.
* pt.c (bt_instantiate_type_proc): Don't assume
CLASSTYPE_TEMPLATE_INFO is non-null.
2018-04-05 Ville Voutilainen <ville.voutilainen@gmail.com>
Implement P0969

1
gcc/cp/pt.c
View file

@ -22841,6 +22841,7 @@ bt_instantiate_type_proc (binding_entry entry, void *data)
tree storage = *(tree *) data;
if (MAYBE_CLASS_TYPE_P (entry->type)
&& CLASSTYPE_TEMPLATE_INFO (entry->type)
&& !uses_template_parms (CLASSTYPE_TI_ARGS (entry->type)))
do_type_instantiation (TYPE_MAIN_DECL (entry->type), storage, 0);
}

9
gcc/testsuite/g++.dg/cpp1z/constexpr-lambda21.C Normal file
View file

@ -0,0 +1,9 @@
// PR c++/85228
// { dg-additional-options -std=c++17 }
template<int> struct A
{
enum E { e = []{ return 0; }() };
};
template class A<0>;