From 1aa1a2a3730cd42b7ea51cdcef89a8845820636a Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Mon, 16 Feb 2026 14:47:01 -0800 Subject: [PATCH] Fix crash when referring to a C++ variable whose type's scope has not been imported. (#6743) --- toolchain/check/cpp/import.cpp | 2 + .../cpp/{globals.carbon => var/global.carbon} | 96 +------------------ .../testdata/interop/cpp/var/namespace.carbon | 77 +++++++++++++++ 3 files changed, 81 insertions(+), 94 deletions(-) rename toolchain/check/testdata/interop/cpp/{globals.carbon => var/global.carbon} (73%) create mode 100644 toolchain/check/testdata/interop/cpp/var/namespace.carbon diff --git a/toolchain/check/cpp/import.cpp b/toolchain/check/cpp/import.cpp index 1165d92f6778..2c8590bfca68 100644 --- a/toolchain/check/cpp/import.cpp +++ b/toolchain/check/cpp/import.cpp @@ -1673,6 +1673,8 @@ static auto AddDependentUnimportedDecls(Context& context, context, type_decl->getASTContext().getTypeDeclType(type_decl), worklist); } + } else if (auto* var_decl = dyn_cast(clang_decl)) { + AddDependentUnimportedTypeDecls(context, var_decl->getType(), worklist); } auto* parent = GetParentDecl(clang_decl); if (llvm::isa_and_nonnull = complete_type_witness %empty_struct_type [concrete] -// CHECK:STDOUT: %pattern_type: type = pattern_type %C [concrete] -// CHECK:STDOUT: } -// CHECK:STDOUT: -// CHECK:STDOUT: imports { -// CHECK:STDOUT: %Core: = namespace file.%Core.import, [concrete] { -// CHECK:STDOUT: import Core//prelude -// CHECK:STDOUT: import Core//prelude/... -// CHECK:STDOUT: } -// CHECK:STDOUT: %Cpp: = namespace file.%Cpp.import_cpp, [concrete] { -// CHECK:STDOUT: .N = %N -// CHECK:STDOUT: import Cpp//... -// CHECK:STDOUT: } -// CHECK:STDOUT: %N: = namespace [concrete] { -// CHECK:STDOUT: .C = %C.decl -// CHECK:STDOUT: .global = %global.var -// CHECK:STDOUT: import Cpp//... -// CHECK:STDOUT: } -// CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {} -// CHECK:STDOUT: %global.patt: %pattern_type = ref_binding_pattern global [concrete] -// CHECK:STDOUT: %global.var_patt: %pattern_type = var_pattern %global.patt [concrete] -// CHECK:STDOUT: %global.var: ref %C = var %global.var_patt [concrete] -// CHECK:STDOUT: } -// CHECK:STDOUT: -// CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace [concrete] { -// CHECK:STDOUT: .Core = imports.%Core -// CHECK:STDOUT: .Cpp = imports.%Cpp -// CHECK:STDOUT: .MyF = %MyF.decl -// CHECK:STDOUT: } -// CHECK:STDOUT: %Core.import = import Core -// CHECK:STDOUT: %Cpp.import_cpp = import_cpp { -// CHECK:STDOUT: import Cpp "namespace.h" -// CHECK:STDOUT: } -// CHECK:STDOUT: %MyF.decl: %MyF.type = fn_decl @MyF [concrete = constants.%MyF] {} {} -// CHECK:STDOUT: } -// CHECK:STDOUT: -// CHECK:STDOUT: class @C { -// CHECK:STDOUT: %empty_struct_type: type = struct_type {} [concrete = constants.%empty_struct_type] -// CHECK:STDOUT: %complete_type: = complete_type_witness %empty_struct_type [concrete = constants.%complete_type] -// CHECK:STDOUT: complete_type_witness = %complete_type -// CHECK:STDOUT: -// CHECK:STDOUT: !members: -// CHECK:STDOUT: import Cpp//... -// CHECK:STDOUT: } -// CHECK:STDOUT: -// CHECK:STDOUT: fn @MyF() { -// CHECK:STDOUT: !entry: -// CHECK:STDOUT: name_binding_decl { -// CHECK:STDOUT: %local.patt: %pattern_type = value_binding_pattern local [concrete] -// CHECK:STDOUT: } -// CHECK:STDOUT: %Cpp.ref.loc7_24: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] -// CHECK:STDOUT: %N.ref.loc7_27: = name_ref N, imports.%N [concrete = imports.%N] -// CHECK:STDOUT: %global.ref: ref %C = name_ref global, imports.%global.var [concrete = imports.%global.var] -// CHECK:STDOUT: %.loc7_19: type = splice_block %C.ref [concrete = constants.%C] { -// CHECK:STDOUT: %Cpp.ref.loc7_14: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] -// CHECK:STDOUT: %N.ref.loc7_17: = name_ref N, imports.%N [concrete = imports.%N] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%C.decl [concrete = constants.%C] -// CHECK:STDOUT: } -// CHECK:STDOUT: %.loc7_29: %C = acquire_value %global.ref -// CHECK:STDOUT: %local: %C = value_binding local, %.loc7_29 -// CHECK:STDOUT: return -// CHECK:STDOUT: } -// CHECK:STDOUT: // CHECK:STDOUT: --- fail_import_unsupported_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: constants { diff --git a/toolchain/check/testdata/interop/cpp/var/namespace.carbon b/toolchain/check/testdata/interop/cpp/var/namespace.carbon new file mode 100644 index 000000000000..2ac8ff41d5bf --- /dev/null +++ b/toolchain/check/testdata/interop/cpp/var/namespace.carbon @@ -0,0 +1,77 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/none.carbon +// +// AUTOUPDATE +// TIP: To test this file alone, run: +// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/interop/cpp/var/namespace.carbon +// TIP: To dump output, run: +// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/interop/cpp/var/namespace.carbon + +// --- namespace.h + +namespace N { +class C {}; +C global; +} // namespace N + +// --- import_namespace.carbon + +library "[[@TEST_NAME]]"; + +import Cpp library "namespace.h"; + +fn MyF() { + let local: Cpp.N.C = Cpp.N.global; +} + +// --- type_in_namespace.carbon + +import Cpp inline ''' +namespace N { +class C {}; +} + +extern N::C c; +'''; + +//@dump-sem-ir-begin +fn F() { + // Import `::c` and its type `N::C` without having ever mentioned `N`. + // This used to cause a crash. + Cpp.c; +} +//@dump-sem-ir-end + +// CHECK:STDOUT: --- type_in_namespace.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: constants { +// CHECK:STDOUT: %F.type: type = fn_type @F [concrete] +// CHECK:STDOUT: %F: %F.type = struct_value () [concrete] +// CHECK:STDOUT: %C: type = class_type @C [concrete] +// CHECK:STDOUT: %pattern_type: type = pattern_type %C [concrete] +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: imports { +// CHECK:STDOUT: %Cpp: = namespace file.%Cpp.import_cpp, [concrete] { +// CHECK:STDOUT: .c = %c.var +// CHECK:STDOUT: import Cpp//... +// CHECK:STDOUT: } +// CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete] +// CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {} +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: fn @F() { +// CHECK:STDOUT: !entry: +// CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] +// CHECK:STDOUT: %c.ref: ref %C = name_ref c, imports.%c.var [concrete = imports.%c.var] +// CHECK:STDOUT: return +// CHECK:STDOUT: } +// CHECK:STDOUT: