From 6f6a01f8595aab1b1e1c6b85f44f2ac74d9de324 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Fri, 23 Oct 2026 17:07:13 +0000 Subject: [PATCH] Support C++ friend declarations for Carbon classes (#8018) When importing a C++ class, check for friend declarations for types and add them to the Carbon class's `friend_scopes`. --- toolchain/check/cpp/import.cpp | 17 ++++++++++++++ .../interop/cpp/class/import/access.carbon | 22 +++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/toolchain/check/cpp/import.cpp b/toolchain/check/cpp/import.cpp index 7c95d81d1021..e10f897c04e5 100644 --- a/toolchain/check/cpp/import.cpp +++ b/toolchain/check/cpp/import.cpp @@ -1015,6 +1015,23 @@ static auto BuildClassDefinition(Context& context, .vtable_id = vtable_id})); } + // Import friend declarations. + for (const auto* f : clang_def->friends()) { + if (const auto* type_source_info = f->getFriendType()) { + auto [friend_type_inst_id, friend_type_id] = + ImportCppType(context, SemIR::LocId(import_ir_inst_id), + type_source_info->getType()); + + if (!friend_type_id.has_value()) { + // TODO: For now, just skip over friends whose types we can't map. + continue; + } + + class_info.friend_scopes.Insert( + context.types().GetConstantId(friend_type_id)); + } + } + class_info.body_block_id = context.inst_block_stack().Pop(); } diff --git a/toolchain/check/testdata/interop/cpp/class/import/access.carbon b/toolchain/check/testdata/interop/cpp/class/import/access.carbon index 8c488d66b5ce..5d65c5ec67d0 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/access.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/access.carbon @@ -1183,6 +1183,28 @@ fn Call(var instance: Cpp.PublicPrivate) { instance.PrivateInstance(); } +// --- cpp_friend_decl_for_carbon_class.carbon +library "[[@TEST_NAME]]"; +import Cpp; + +class B; + +inline Cpp ''' +class A { + friend class Carbon::B; + +private: + int i; +}; +'''; + +class B { + fn F() { + var a: Cpp.A = Cpp.A.A(); + a.i = 1; + } +} + // CHECK:STDOUT: --- import_non_function_member_public.carbon // CHECK:STDOUT: // CHECK:STDOUT: constants {