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

Add unit tagging to ImportIRId (#6265)

Browse Source 
Co-authored-by: josh11b <15258583+josh11b@users.noreply.github.com>
This commit is contained in:
David Blaikie
2025-10-23 17:34:35 +00:00
committed by GitHub
co-authored by josh11b
parent c329bce240
commit 4f1f0fc7c2
6 changed files with 233 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/import.cpp
+13 -7
View File
@@ -246,8 +246,10 @@ static auto CopySingleNameScopeFromImportIR(
auto namespace_const_id =
context.constant_values().Get(result.add_result.inst_id);
context.import_ir_constant_values()[ir_id.index].Set(import_inst_id,
namespace_const_id);
context
.import_ir_constant_values()[context.sem_ir().import_irs().GetRawIndex(
ir_id)]
.Set(import_inst_id, namespace_const_id);
if (copied_namespaces) {
CacheCopiedNamespace(*copied_namespaces, import_scope_id,
@@ -484,9 +486,11 @@ auto ImportLibrariesFromCurrentPackage(
for (auto import_ir : import_irs) {
auto ir_id = AddImportIR(context, import_ir);
context.import_ir_constant_values()[ir_id.index].Set(
SemIR::Namespace::PackageInstId,
context.constant_values().Get(SemIR::Namespace::PackageInstId));
context
.import_ir_constant_values()[context.sem_ir().import_irs().GetRawIndex(
ir_id)]
.Set(SemIR::Namespace::PackageInstId,
context.constant_values().Get(SemIR::Namespace::PackageInstId));
for (const auto import_inst_id :
import_ir.sem_ir->inst_blocks().Get(SemIR::InstBlockId::Exports)) {
@@ -548,8 +552,10 @@ auto ImportLibrariesFromOtherPackage(Context& context,
for (auto import_ir : import_irs) {
auto ir_id = AddImportIR(context, import_ir);
scope.AddImportIRScope({ir_id, SemIR::NameScopeId::Package});
context.import_ir_constant_values()[ir_id.index].Set(
SemIR::Namespace::PackageInstId, namespace_const_id);
context
.import_ir_constant_values()[context.sem_ir().import_irs().GetRawIndex(
ir_id)]
.Set(SemIR::Namespace::PackageInstId, namespace_const_id);
}
if (has_load_error) {
scope.set_has_error();