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

PR c++/69323 - valid 

* pt.c (instantiate_class_template_1): Set
	processing_template_decl before substituting friend_type.

From-SVN: r233681
This commit is contained in:
Jason Merrill 2016-02-24 14:56:03 -05:00 committed by Jason Merrill
parent 4e7bcf32fe
commit b8599b68ed
3 changed files with 21 additions and 3 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 @@
2016-02-24 Jason Merrill <jason@redhat.com>
PR c++/69323
* pt.c (instantiate_class_template_1): Set
processing_template_decl before substituting friend_type.
016-02-24 Martin Sebor <msebor@redhat.com>
PR c++/69912

6
gcc/cp/pt.c
View File

@ -10180,11 +10180,11 @@ instantiate_class_template_1 (tree type)
template <class U> friend class T::C;
otherwise. */
/* Bump processing_template_decl in case this is something like
template <class T> friend struct A<T>::B. */
++processing_template_decl;
friend_type = tsubst (friend_type, args,
tf_warning_or_error, NULL_TREE);
/* Bump processing_template_decl for correct
dependent_type_p calculation. */
++processing_template_decl;
if (dependent_type_p (friend_type))
adjust_processing_template_decl = true;
--processing_template_decl;

12
gcc/testsuite/g++.dg/template/friend61.C Normal file
View File

@ -0,0 +1,12 @@
// PR c++/69323
template<int VALUE>
struct Outer
{
struct StupidValueTrick
{
template<int VAL> friend struct Outer<VAL>::StupidValueTrick;
};
};
typedef Outer<42>::StupidValueTrick GoodValue;
GoodValue good;