OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* semantics.c (finish_template_type): Check CLASSTYPE_TEMPLATE_INFO. 

From-SVN: r246680
This commit is contained in:
Jason Merrill 2017-04-04 11:25:21 -04:00 committed by Jason Merrill
parent 15f12d9677
commit e43073896c
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
2017-04-03 Jason Merrill <jason@redhat.com>
* semantics.c (finish_template_type): Check CLASSTYPE_TEMPLATE_INFO.
2017-04-03 Jonathan Wakely <jwakely@redhat.com>
* class.c (update_vtable_entry_for_fn): Fix typo in comment.

1
gcc/cp/semantics.c
View File

@ -3157,6 +3157,7 @@ finish_template_type (tree name, tree args, int entering_scope)
if (flag_concepts
&& entering_scope
&& CLASS_TYPE_P (type)
&& CLASSTYPE_TEMPLATE_INFO (type)
&& dependent_type_p (type)
&& PRIMARY_TEMPLATE_P (CLASSTYPE_TI_TEMPLATE (type)))
type = fixup_template_type (type);

18
gcc/testsuite/g++.dg/concepts/regress/alias-decl-42.C Normal file
View File

@ -0,0 +1,18 @@
// PR c++/59200
// { dg-options "-std=c++1z -fconcepts" }
struct A
{
static constexpr bool value = true;
};
template<typename T>
struct B
{
template<typename U>
using C = A;
};
template<typename T>
template<typename U>
const bool B<T>::C<U>::value; // { dg-error "too many" }