https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106740
--- Comment #6 from CVS Commits <cvs-commit at gcc dot gnu.org> --- The releases/gcc-11 branch has been updated by Jason Merrill <ja...@gcc.gnu.org>: https://gcc.gnu.org/g:0697a1a426424468b9bdf3d845237cab26ce78d7 commit r11-10751-g0697a1a426424468b9bdf3d845237cab26ce78d7 Author: Jason Merrill <ja...@redhat.com> Date: Tue Jun 7 15:52:30 2022 -0400 c++: non-templated friends [PR105852] The previous patch for 105852 avoids copying DECL_TEMPLATE_INFO from a non-templated friend, but it really shouldn't have it in the first place. PR c++/106740 PR c++/105852 gcc/cp/ChangeLog: * decl.c (duplicate_decls): Change non-templated friend check to an assert. * pt.c (tsubst_function_decl): Don't set DECL_TEMPLATE_INFO on non-templated friends. (tsubst_friend_function): Adjust. gcc/testsuite/ChangeLog: * g++.dg/template/friend78.C: New test.