https://gcc.gnu.org/bugzilla/show_bug.cgi?id=119939
--- Comment #2 from GCC Commits <cvs-commit at gcc dot gnu.org> --- The releases/gcc-15 branch has been updated by Nathaniel Shead <nsh...@gcc.gnu.org>: https://gcc.gnu.org/g:57feb6afcade6b066477359bee41d071225ab499 commit r15-9594-g57feb6afcade6b066477359bee41d071225ab499 Author: Nathaniel Shead <nathanielosh...@gmail.com> Date: Sat Apr 26 00:10:34 2025 +1000 c++/modules: Ensure DECL_FRIEND_CONTEXT is streamed [PR119939] An instantiated friend function relies on DECL_FRIEND_CONTEXT being set to be able to recover the template arguments of the class that instantiated it, despite not being a template itself. This patch ensures that this data is streamed even when DECL_CLASS_SCOPE_P is not true. PR c++/119939 gcc/cp/ChangeLog: * module.cc (trees_out::lang_decl_vals): Also stream lang->u.fn.context when DECL_UNIQUE_FRIEND_P. (trees_in::lang_decl_vals): Likewise. gcc/testsuite/ChangeLog: * g++.dg/modules/concept-11_a.H: New test. * g++.dg/modules/concept-11_b.C: New test. Signed-off-by: Nathaniel Shead <nathanielosh...@gmail.com> (cherry picked from commit 1c5cf7cc82d3a2afa5d4fb90049456be408c2a7a)