Finish removing BuiltinInstKind (#4637)

This commit is contained in:
Jon Ross-Perkins
2024-12-05 22:07:51 +00:00
committed by GitHub
parent e4eeacabe7
commit 1cba3328f7
34 changed files with 84 additions and 196 deletions
+3 -3
View File
@@ -619,7 +619,7 @@ static auto CheckCompleteAdapterClassType(Context& context,
return context.AddInst<SemIR::CompleteTypeWitness>(
node_id,
{.type_id = context.GetBuiltinType(SemIR::BuiltinInstKind::WitnessType),
{.type_id = context.GetSingletonType(SemIR::WitnessType::SingletonInstId),
.object_repr_id = object_repr_id});
}
@@ -679,7 +679,7 @@ static auto CheckCompleteClassType(Context& context, Parse::NodeId node_id,
struct_type_fields.push_back(
{.name_id = SemIR::NameId::Vptr,
.type_id = context.GetPointerType(
context.GetBuiltinType(SemIR::BuiltinInstKind::VtableType))});
context.GetSingletonType(SemIR::VtableType::SingletonInstId))});
}
if (base_type_id.is_valid()) {
auto base_decl = context.insts().GetAs<SemIR::BaseDecl>(class_info.base_id);
@@ -692,7 +692,7 @@ static auto CheckCompleteClassType(Context& context, Parse::NodeId node_id,
return context.AddInst<SemIR::CompleteTypeWitness>(
node_id,
{.type_id = context.GetBuiltinType(SemIR::BuiltinInstKind::WitnessType),
{.type_id = context.GetSingletonType(SemIR::WitnessType::SingletonInstId),
.object_repr_id = context.GetStructType(
AddStructTypeFields(context, struct_type_fields))});
}