Remove InstId::Builtin members (#4632)

- `InstId::Builtin<Inst>` -> `<Inst>::SingletonInstId`
- `InstId::PackageNamespace` -> `Namespace::PackageInstId`
This commit is contained in:
Jon Ross-Perkins
2024-12-05 18:13:46 +00:00
committed by GitHub
parent d79d9e0884
commit efab39cbd9
38 changed files with 131 additions and 150 deletions
+2 -2
View File
@@ -1139,7 +1139,7 @@ static auto GetLocalNameScopeId(ImportRefResolver& resolver,
break;
}
default: {
if (const_inst_id == SemIR::InstId::BuiltinErrorInst) {
if (const_inst_id == SemIR::ErrorInst::SingletonInstId) {
return SemIR::NameScopeId::Invalid;
}
break;
@@ -1614,7 +1614,7 @@ static auto TryResolveTypedInst(ImportRefResolver& resolver,
SemIR::CompleteTypeWitness inst)
-> ResolveResult {
CARBON_CHECK(resolver.import_types().GetInstId(inst.type_id) ==
SemIR::InstId::BuiltinWitnessType);
SemIR::WitnessType::SingletonInstId);
auto object_repr_const_id = GetLocalConstantId(resolver, inst.object_repr_id);
if (resolver.HasNewWork()) {
return ResolveResult::Retry();