diff --git a/toolchain/check/cpp/import.cpp b/toolchain/check/cpp/import.cpp index e10f897c04e5..7bf64962a333 100644 --- a/toolchain/check/cpp/import.cpp +++ b/toolchain/check/cpp/import.cpp @@ -1029,6 +1029,16 @@ static auto BuildClassDefinition(Context& context, class_info.friend_scopes.Insert( context.types().GetConstantId(friend_type_id)); + } else { + auto* friend_decl = f->getFriendDecl(); + // TODO: support function friend decls. + if (!friend_decl->isFunctionOrFunctionTemplate()) { + auto key = SemIR::ClangDeclKey::ForNonFunctionDecl(friend_decl); + auto inst_id = + ImportCppDecl(context, SemIR::LocId(import_ir_inst_id), key); + + class_info.friend_scopes.Insert(context.constant_values().Get(inst_id)); + } } } diff --git a/toolchain/check/testdata/interop/cpp/class/import/access.carbon b/toolchain/check/testdata/interop/cpp/class/import/access.carbon index 5d65c5ec67d0..aba3c707eec7 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/access.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/access.carbon @@ -1183,6 +1183,29 @@ fn Call(var instance: Cpp.PublicPrivate) { instance.PrivateInstance(); } +// --- cpp_friend_decl_for_carbon_generic_class.carbon +library "[[@TEST_NAME]]"; +import Cpp; + +class B(T: type); + +inline Cpp ''' +class A { + template + friend class Carbon::B; + +private: + int i; +}; +'''; + +class B(T: type) { + fn F() { + var a: Cpp.A = Cpp.A.A(); + a.i = 1; + } +} + // --- cpp_friend_decl_for_carbon_class.carbon library "[[@TEST_NAME]]"; import Cpp;