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

Fix SemIR not showing insts used to compute FieldDecl type (#7706)

Browse Source 
Add an `ExprRegionId` to `FieldDecl`. This required moving the `NameId`
into `Field`.
This commit is contained in:
Nicholas Bishop
2026-09-02 20:28:05 +00:00
committed by GitHub
parent ed074e85ab
commit d8bb181db8
93 changed files with 1117 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/import_ref.cpp
+22 -4
View File
@@ -180,6 +180,9 @@ class ImportContext {
auto import_entity_names() -> const SemIR::EntityNameStore& {
return import_ir().entity_names();
}
auto import_expr_regions() -> const SemIR::ExprRegionStore& {
return import_ir().expr_regions();
}
auto import_facet_types() -> const SemIR::DeclaredFacetTypeStore& {
return import_ir().declared_facet_types();
}
@@ -265,6 +268,9 @@ class ImportContext {
auto local_entity_names() -> SemIR::EntityNameStore& {
return local_ir().entity_names();
}
auto local_expr_regions() -> SemIR::ExprRegionStore& {
return local_ir().expr_regions();
}
auto local_facet_types() -> SemIR::DeclaredFacetTypeStore& {
return local_ir().declared_facet_types();
}
@@ -2303,6 +2309,11 @@ static auto TryResolveTypedInst(ImportRefResolver& resolver,
static auto TryResolveTypedInst(ImportRefResolver& resolver,
SemIR::FieldDecl inst,
SemIR::InstId import_inst_id) -> ResolveResult {
auto import_expr_region =
resolver.import_expr_regions().Get(inst.type_region_id);
SemIR::ExprRegion expr_region{
.result_id = AddImportRef(resolver, import_expr_region.result_id)};
auto const_id = GetLocalConstantId(resolver, inst.type_id);
const auto& import_field = resolver.import_ir().fields().Get(inst.field_id);
auto initializer_id =
@@ -2311,13 +2322,20 @@ static auto TryResolveTypedInst(ImportRefResolver& resolver,
return ResolveResult::Retry();
}
auto type_region_id = resolver.local_expr_regions().Add(expr_region);
auto field_id = resolver.local_ir().fields().Add(
{.index = import_field.index, .initializer_id = initializer_id});
{.index = import_field.index,
.name_id = GetLocalNameId(resolver, import_field.name_id),
.initializer_id = initializer_id});
return ResolveResult::Unique<SemIR::FieldDecl>(
resolver, import_inst_id,
{.type_id = resolver.local_types().GetTypeIdForTypeConstantId(const_id),
.name_id = GetLocalNameId(resolver, inst.name_id),
.field_id = field_id});
{
.type_id =
resolver.local_types().GetTypeIdForTypeConstantId(const_id),
.field_id = field_id,
.type_region_id = type_region_id,
});
}
static auto TryResolveTypedInst(ImportRefResolver& resolver,