carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 11:11:05 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Use primary context for mapping

Browse Source
This commit is contained in:
David Blaikie
2026-03-23 07:39:14 +00:00
parent 2669787583
commit edbc565c56
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/cpp/generate_ast.cpp
+7 -6
View File
@@ -383,8 +383,8 @@ auto CarbonExternalASTSource::MapInstIdToClangDecl(
auto* namespace_decl = clang::NamespaceDecl::Create(
*ast_context_, &decl_context, false, clang::SourceLocation(),
clang::SourceLocation(), identifier_info, nullptr, false);
auto result = scope_mapping.Insert(
static_cast<clang::DeclContext*>(namespace_decl), target_inst_id);
auto result = scope_mapping.Insert(namespace_decl->getPrimaryContext(),
target_inst_id);
CARBON_CHECK(result.is_inserted(), "Inserting over an existing entry.");
namespace_decl->setHasExternalVisibleStorage();
return namespace_decl;
@@ -395,7 +395,8 @@ auto CarbonExternalASTSource::MapInstIdToClangDecl(
auto CarbonExternalASTSource::FindExternalVisibleDeclsByName(
const clang::DeclContext* decl_context, clang::DeclarationName decl_name,
const clang::DeclContext* /*OriginalDC*/) -> bool {
auto decl_context_inst_id = scope_mapping.Lookup(decl_context);
auto decl_context_inst_id =
scope_mapping.Lookup(decl_context->getPrimaryContext());
if (!decl_context_inst_id) {
// If the context doesn't already have a mapping between C++ and Carbon,
@@ -420,9 +421,9 @@ auto CarbonExternalASTSource::FindExternalVisibleDeclsByName(
clang::SourceLocation(), &ast_context.Idents.get(carbon_namespace_name),
nullptr, false);
carbon_cpp_namespace->setHasExternalVisibleStorage();
auto result = scope_mapping.Insert(
static_cast<clang::DeclContext*>(carbon_cpp_namespace),
SemIR::Namespace::PackageInstId);
auto result =
scope_mapping.Insert(carbon_cpp_namespace->getPrimaryContext(),
SemIR::Namespace::PackageInstId);
CARBON_CHECK(result.is_inserted(), "Inserting over an existing entry.");
SetExternalVisibleDeclsForName(decl_context, decl_name,
{carbon_cpp_namespace});