diff options
author | Jason Merrill <jason@redhat.com> | 2022-06-06 21:49:06 -0400 |
---|---|---|
committer | Jason Merrill <jason@redhat.com> | 2022-06-08 16:37:50 -0400 |
commit | 7d87790a871482e9c5142a8e885b4a5f76d197c8 (patch) | |
tree | 325dc6c6b4fc7a1911fa124eb13a61cc3907856f /gcc/cp/cp-tree.h | |
parent | b6e1373bd34aebbb512a03ea9a4e3c7acd955382 (diff) | |
download | gcc-7d87790a871482e9c5142a8e885b4a5f76d197c8.zip gcc-7d87790a871482e9c5142a8e885b4a5f76d197c8.tar.gz gcc-7d87790a871482e9c5142a8e885b4a5f76d197c8.tar.bz2 |
c++: redeclared hidden friend take 2 [PR105852]
My previous patch for 105761 avoided copying DECL_TEMPLATE_INFO from a
friend to a later definition, but in this testcase we have first a
non-friend declaration and then a definition, and we need to avoid copying
in that case as well. But we do still want to set new_template_info to
avoid GC trouble.
With this change, the modules dump correctly identifies ::foo as a
non-template function in tpl-friend-2_a.C.
Along the way I noticed that the duplicate_decls handling of
DECL_UNIQUE_FRIEND_P was backwards for templates, where we don't clobber
DECL_LANG_SPECIFIC (olddecl) with DECL_LANG_SPECIFIC (newdecl) like we do
for non-templates.
PR c++/105852
PR c++/105761
gcc/cp/ChangeLog:
* decl.cc (duplicate_decls): Avoid copying template info
from non-templated friend even if newdecl isn't a definition.
Correct handling of DECL_UNIQUE_FRIEND_P on templates.
* pt.cc (non_templated_friend_p): New.
* cp-tree.h (non_templated_friend_p): Declare it.
gcc/testsuite/ChangeLog:
* g++.dg/modules/tpl-friend-2_a.C: Adjust expected dump.
* g++.dg/template/friend74.C: New test.
Diffstat (limited to 'gcc/cp/cp-tree.h')
-rw-r--r-- | gcc/cp/cp-tree.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index cc13809..3d8a08b 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -7395,6 +7395,7 @@ extern bool push_tinst_level_loc (tree, location_t); extern bool push_tinst_level_loc (tree, tree, location_t); extern void pop_tinst_level (void); extern struct tinst_level *outermost_tinst_level(void); +extern bool non_templated_friend_p (tree); extern void init_template_processing (void); extern void print_template_statistics (void); bool template_template_parameter_p (const_tree); |