carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 07:34:45 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Switch TypeId::TypeType to TypeType::SingletonTypeId, and similar (#4619)

Browse Source 
`ids.h` and `ids.cpp` are the manual edits, everything else is
search-and-replace.

The full list of things moved is:

- `TypeId::TypeType`
- `TypeId::AutoType`
- `TypeId::Error`
- `ConstantId::Error`

This is to unblock removing `InstId::Builtin*`.
This commit is contained in:
Jon Ross-Perkins
2024-12-04 18:40:50 +00:00
committed by GitHub
parent 78d7a7c291
commit 0e92e6cc5a
30 changed files with 169 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/impl.cpp
+2 -2
View File
@@ -170,7 +170,7 @@ static auto BuildInterfaceWitness(
auto decl = context.insts().Get(decl_id);
CARBON_KIND_SWITCH(decl) {
case CARBON_KIND(SemIR::StructValue struct_value): {
if (struct_value.type_id == SemIR::TypeId::Error) {
if (struct_value.type_id == SemIR::ErrorInst::SingletonTypeId) {
return SemIR::InstId::BuiltinErrorInst;
}
auto type_inst = context.types().GetAsInst(struct_value.type_id);
@@ -229,7 +229,7 @@ auto BuildImplWitness(Context& context, SemIR::ImplId impl_id)
CARBON_CHECK(impl.is_being_defined());
auto facet_type_id = context.GetTypeIdForTypeInst(impl.constraint_id);
if (facet_type_id == SemIR::TypeId::Error) {
if (facet_type_id == SemIR::ErrorInst::SingletonTypeId) {
return SemIR::InstId::BuiltinErrorInst;
}
auto facet_type = context.types().TryGetAs<SemIR::FacetType>(facet_type_id);