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

c++: redeclared hidden friend [PR105761]

Browse Source 
Here, when we see the second declaration of f we match it with the first
one, copy over DECL_TEMPLATE_INFO, and then try to use it when parsing the
definition, leading to confusion.

	PR c++/105761

gcc/cp/ChangeLog:

	* decl.cc (duplicate_decls): Don't copy DECL_TEMPLATE_INFO
	from a hidden friend.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp1y/auto-fn64.C: New test.
This commit is contained in:
Jason Merrill 2022-06-03 12:35:12 -04:00
parent 44a5bd6d93
commit 284ae8b46f
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/cp/decl.cc
View File

@ -2654,7 +2654,13 @@ duplicate_decls (tree newdecl, tree olddecl, bool hiding, bool was_hidden)
if (LANG_DECL_HAS_MIN (newdecl))
{
DECL_ACCESS (newdecl) = DECL_ACCESS (olddecl);
if (DECL_TEMPLATE_INFO (newdecl))
if (new_defines_function
&& DECL_TEMPLATE_INFO (olddecl)
&& DECL_UNIQUE_FRIEND_P (DECL_TEMPLATE_RESULT
(DECL_TI_TEMPLATE (olddecl))))
/* Don't copy template info from a non-template friend declaration
in a class template (PR105761). */;
else if (DECL_TEMPLATE_INFO (newdecl))
{
new_template_info = DECL_TEMPLATE_INFO (newdecl);
if (DECL_TEMPLATE_INSTANTIATION (olddecl)
@ -2662,8 +2668,10 @@ duplicate_decls (tree newdecl, tree olddecl, bool hiding, bool was_hidden)
/* Remember the presence of explicit specialization args. */
TINFO_USED_TEMPLATE_ID (DECL_TEMPLATE_INFO (olddecl))
= TINFO_USED_TEMPLATE_ID (new_template_info);
DECL_TEMPLATE_INFO (newdecl) = DECL_TEMPLATE_INFO (olddecl);
}
DECL_TEMPLATE_INFO (newdecl) = DECL_TEMPLATE_INFO (olddecl);
else
DECL_TEMPLATE_INFO (newdecl) = DECL_TEMPLATE_INFO (olddecl);
}
if (DECL_DECLARES_FUNCTION_P (newdecl))

12
gcc/testsuite/g++.dg/cpp1y/auto-fn64.C Normal file
View File

@ -0,0 +1,12 @@
// PR c++/105761
// { dg-do compile { target c++14 } }
// { dg-additional-options -Wno-non-template-friend }
template <class T>
class X {
friend auto f(X);
};
struct Y : X<long> {
friend auto f(X) { return 0L; }
};