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

CrossRefIRId -> ImportIRId (#3662)

Browse Source 
One more (hopefully last) rename on the Import instruction renaming.

I was kind of tempted to rename to just "IRId", since the IRs aren't all
imports. However, this felt easier to read, and a better choice than
CrossRef because it's more consistent with the other ways imports exist
in code. (even if IRs aren't all imports, most use-cases are derived
from imports)

Note though that import_irs may include IRs not just from direct
imports. Beyond the builtin IR, I'm thinking that for indirect imports,
or the prelude, we may end up adding them. e.g., so that constants can
be generated for indirect imports and still correspond to a directly
known IR, and for a given IR that's indirectly imported multiple times
to be deduplicated locally. I'm not there yet, I'm just mentioning this
to help give background for naming thoughts.
This commit is contained in:
Jon Ross-Perkins
2024-01-29 23:05:47 +00:00
committed by GitHub
parent bf02d1f4b0
commit 7f11012f58
15 changed files with 48 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/sem_ir/file.cpp
+8 -9
View File
@@ -66,8 +66,8 @@ File::File(SharedValueStores& value_stores)
type_blocks_(allocator_),
inst_blocks_(allocator_),
constants_(*this, allocator_) {
auto builtins_id = cross_ref_irs_.Add(this);
CARBON_CHECK(builtins_id == CrossRefIRId::Builtins)
auto builtins_id = import_irs_.Add(this);
CARBON_CHECK(builtins_id == ImportIRId::Builtins)
<< "Builtins must be the first IR, even if self-referential";
insts_.Reserve(BuiltinKind::ValidCount);
@@ -100,19 +100,19 @@ File::File(SharedValueStores& value_stores, std::string filename,
inst_blocks_(allocator_),
constants_(*this, allocator_) {
CARBON_CHECK(builtins != nullptr);
auto builtins_id = cross_ref_irs_.Add(builtins);
CARBON_CHECK(builtins_id == CrossRefIRId::Builtins)
auto builtins_id = import_irs_.Add(builtins);
CARBON_CHECK(builtins_id == ImportIRId::Builtins)
<< "Builtins must be the first IR";
// Copy builtins over.
insts_.Reserve(BuiltinKind::ValidCount);
static constexpr auto BuiltinIR = CrossRefIRId(0);
for (auto [i, inst] : llvm::enumerate(builtins->insts_.array_ref())) {
// We can reuse the type IDs from the builtins IR because they're
// special-cased values.
auto type_id = inst.type_id();
auto builtin_id = SemIR::InstId(i);
insts_.AddInNoBlock({ImportRefUsed{type_id, BuiltinIR, builtin_id}});
insts_.AddInNoBlock(
{ImportRefUsed{type_id, ImportIRId::Builtins, builtin_id}});
constant_values_.Set(builtin_id,
SemIR::ConstantId::ForTemplateConstant(builtin_id));
}
@@ -161,8 +161,7 @@ auto File::OutputYaml(bool include_builtins) const -> Yaml::OutputMapping {
map.Add("filename", filename_);
map.Add(
"sem_ir", Yaml::OutputMapping([&](Yaml::OutputMapping::Map map) {
map.Add("cross_ref_irs_size",
Yaml::OutputScalar(cross_ref_irs_.size()));
map.Add("import_irs_size", Yaml::OutputScalar(import_irs_.size()));
map.Add("name_scopes", name_scopes_.OutputYaml());
map.Add("bind_names", bind_names_.OutputYaml());
map.Add("functions", functions_.OutputYaml());
@@ -509,7 +508,7 @@ auto GetExprCategory(const File& file, InstId inst_id) -> ExprCategory {
case ImportRefUsed::Kind: {
auto import_ref = inst.As<ImportRefUsed>();
ir = ir->cross_ref_irs().Get(import_ref.ir_id);
ir = ir->import_irs().Get(import_ref.ir_id);
inst_id = import_ref.inst_id;
continue;
}