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

Store Clang Decls in a CanonicalValueStore (#5638)

Browse Source 
Saves space since in most cases, we only need a `None` 32 bits index
instead of a null 64 bits pointer.

Based on discussions in [Carbon C++ Interop
weekly](https://docs.google.com/document/d/1YlxEOJ0r-o19o19TCJbFl4Ln1U88yn_Vj23y1Hr5vTk/edit?tab=t.0#heading=h.23l56bt5xwlu)
and Discord
([1](https://discord.com/channels/655572317891461132/768530752592805919/1375121180306047106),
[2](https://discord.com/channels/655572317891461132/768530752592805919/1380575881050718469)).

Note: Any `clang::DeclContext` is also a `clang::Decl`.

Part of #4666.
This commit is contained in:
Boaz Brickner
2025-06-10 16:55:29 +00:00
committed by GitHub
parent 6753a715f6
commit e4c8150f2c
7 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/import_cpp.cpp
+10 -6
View File
@@ -252,8 +252,8 @@ auto ImportCppFiles(Context& context, llvm::StringRef importing_file_path,
SemIR::NameScope& name_scope = context.name_scopes().Get(name_scope_id);
name_scope.set_is_closed_import(true);
name_scope.set_cpp_decl_context(
generated_ast->getASTContext().getTranslationUnitDecl());
name_scope.set_clang_decl_context_id(context.sem_ir().clang_decls().Add(
generated_ast->getASTContext().getTranslationUnitDecl()));
if (ast_has_error) {
name_scope.set_has_error();
@@ -291,7 +291,9 @@ static auto ClangLookup(Context& context, SemIR::NameScopeId scope_id,
lookup.suppressDiagnostics();
bool found = sema.LookupQualifiedName(
lookup, context.name_scopes().Get(scope_id).cpp_decl_context());
lookup,
clang::dyn_cast<clang::DeclContext>(context.sem_ir().clang_decls().Get(
context.name_scopes().Get(scope_id).clang_decl_context_id())));
if (!found) {
return std::nullopt;
@@ -468,7 +470,7 @@ static auto ImportFunctionDecl(Context& context, SemIR::LocId loc_id,
.return_slot_pattern_id = return_slot_pattern_id,
.virtual_modifier = SemIR::FunctionFields::VirtualModifier::None,
.self_param_id = SemIR::InstId::None,
.cpp_decl = clang_decl}};
.clang_decl_id = context.sem_ir().clang_decls().Add(clang_decl)}};
function_decl.function_id = context.functions().Add(function_info);
@@ -492,7 +494,8 @@ static auto ImportNamespaceDecl(Context& context,
name_id, parent_scope_id, /*import_id=*/SemIR::InstId::None);
context.name_scopes()
.Get(result.name_scope_id)
.set_cpp_decl_context(clang_decl);
.set_clang_decl_context_id(
context.sem_ir().clang_decls().Add(clang_decl));
return result.inst_id;
}
@@ -555,7 +558,8 @@ static auto BuildClassDefinition(Context& context,
context.name_scopes()
.Get(class_info.scope_id)
.set_cpp_decl_context(clang_decl);
.set_clang_decl_context_id(
context.sem_ir().clang_decls().Add(clang_decl));
return {class_id, class_decl_id};
}