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

Rename singleton InstId constants to TypeInstId (#5323)

Browse Source 
These constant instructions are all TypeInstId already in their type,
and this makes their names match.

Change the name of MakeSingletonInstId as well and update its comment.
This commit is contained in:
Dana Jansens
2025-04-17 18:57:20 +00:00
committed by GitHub
parent bf32da8dad
commit c38e723dd8
26 changed files with 113 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/class.cpp
+4 -4
View File
@@ -97,7 +97,7 @@ static auto CheckCompleteAdapterClassType(
return AddInst<SemIR::CompleteTypeWitness>(
context, node_id,
{.type_id = GetSingletonType(context, SemIR::WitnessType::InstId),
{.type_id = GetSingletonType(context, SemIR::WitnessType::TypeInstId),
// TODO: Use InstId from the adapt declaration.
.object_repr_type_inst_id = context.types().GetInstId(object_repr_id)});
}
@@ -184,7 +184,7 @@ static auto BuildVtable(Context& context, Parse::NodeId node_id,
}
return AddInst<SemIR::Vtable>(
context, node_id,
{.type_id = GetSingletonType(context, SemIR::VtableType::InstId),
{.type_id = GetSingletonType(context, SemIR::VtableType::TypeInstId),
.virtual_functions_id = context.inst_blocks().Add(vtable)});
}
@@ -223,7 +223,7 @@ static auto CheckCompleteClassType(
struct_type_fields.push_back(
{.name_id = SemIR::NameId::Vptr,
.type_inst_id = context.types().GetInstId(
GetPointerType(context, SemIR::VtableType::InstId))});
GetPointerType(context, SemIR::VtableType::TypeInstId))});
}
if (base_type_id.has_value()) {
auto base_decl = context.insts().GetAs<SemIR::BaseDecl>(class_info.base_id);
@@ -249,7 +249,7 @@ static auto CheckCompleteClassType(
return AddInst<SemIR::CompleteTypeWitness>(
context, node_id,
{.type_id = GetSingletonType(context, SemIR::WitnessType::InstId),
{.type_id = GetSingletonType(context, SemIR::WitnessType::TypeInstId),
.object_repr_type_inst_id = struct_type_inst_id});
}