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

PR c++/69323 - errors 

* friend.c (make_friend_class): Likewise.
	* decl.c (lookup_and_check_tag): Diagnose invalid dependent friend.

From-SVN: r233682
This commit is contained in:
Jason Merrill 2016-02-24 14:56:09 -05:00 committed by Jason Merrill
parent b8599b68ed
commit 944e9f5fee
6 changed files with 57 additions and 1 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
* friend.c (make_friend_class): Likewise.
* decl.c (lookup_and_check_tag): Diagnose invalid dependent friend.
2016-02-24 Jason Merrill <jason@redhat.com>
PR c++/69323

14
gcc/cp/decl.c
View File

@ -12590,6 +12590,20 @@ lookup_and_check_tag (enum tag_types tag_code, tree name,
decl,
template_header_p
| DECL_SELF_REFERENCE_P (decl));
if (template_header_p && t && CLASS_TYPE_P (t)
&& (!CLASSTYPE_TEMPLATE_INFO (t)
|| (!PRIMARY_TEMPLATE_P (CLASSTYPE_TI_TEMPLATE (t)))))
{
error ("%qT is not a template", t);
inform (location_of (t), "previous declaration here");
if (TYPE_CLASS_SCOPE_P (t)
&& CLASSTYPE_TEMPLATE_INFO (TYPE_CONTEXT (t)))
inform (input_location,
"perhaps you want to explicitly add %<%T::%>",
TYPE_CONTEXT (t));
t = error_mark_node;
}
return t;
}
else if (decl && TREE_CODE (decl) == TREE_LIST)

12
gcc/cp/friend.c
View File

@ -255,6 +255,18 @@ make_friend_class (tree type, tree friend_type, bool complain)
friend_type);
return;
}
if (TYPE_TEMPLATE_INFO (friend_type)
&& !PRIMARY_TEMPLATE_P (TYPE_TI_TEMPLATE (friend_type)))
{
error ("%qT is not a template", friend_type);
inform (location_of (friend_type), "previous declaration here");
if (TYPE_CLASS_SCOPE_P (friend_type)
&& CLASSTYPE_TEMPLATE_INFO (TYPE_CONTEXT (friend_type))
&& currently_open_class (TYPE_CONTEXT (friend_type)))
inform (input_location, "perhaps you need explicit template "
"arguments in your nested-name-specifier");
return;
}
}
else if (same_type_p (type, friend_type))
{

2
gcc/testsuite/g++.dg/template/crash34.C
View File

@ -7,6 +7,6 @@
class Foo;
template <typename T> class Foo { }; // { dg-error "not a template type" }
template <typename T> class Foo { }; // { dg-error "not a template" }
Foo<int> x; // { dg-error "not a template|incomplete type" }

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

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

12
gcc/testsuite/g++.dg/template/friend61b.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::StupidValueTrick; // { dg-error "not a template" }
};
};
typedef Outer<42>::StupidValueTrick GoodValue;
GoodValue good;