Make SemIR::TypeType be an empty FacetType instruction (#7813)

The type `type` is now a `FacetType` inst with no constraints. This
brings the model implemented in the toolchain into better alignment with
the language design. The `SemIR::TypeType` struct remains as a scope for
holding the `TypeInstId`, `ConstantId`, and `TypeId` constants, but is
not an `InstKind` anymore.

The `TypeType` inst looks a lot like singletons, but there are many
`FacetType` insts so it doesn't quite fit that model. So we put it
alongside singletons with a fixed inst id but refer to it as a more
general "builtin" inst that is not a singleton.
`Namespace::PackageInstId` is similar, and we group it with `TypeType`
conceptually as another builtin instruction with a fixed id.

No conversion is needed anymore to use a `type` as a facet, since types
also have a `FacetType` type. This simplifies and removes a number of
helpers and branches throughout the code.

The `TypeType` inst is now part of the constant store, so we end up
printing it in the constants block in every test. But it's also named
`type` rather than `%type` to preserve the majority of existing
formatting behaviour, though this does look different from other
constants.

Assisted-by: Opus 5 was used to generate a first draft and validate the
refactoring. Though nearly everything non-trivial the tool wrote has
been modified or rewritten.
This commit is contained in:
Dana Jansens
2026-09-22 15:04:40 +00:00
committed by GitHub
parent 83ca5b71e3
commit fcae9610bd
795 changed files with 9505 additions and 8048 deletions
+22 -9
View File
@@ -214,24 +214,37 @@ auto EvalConstantInst(Context& context, SemIR::ExportDecl inst)
auto EvalConstantInst(Context& context, SemIR::FacetAccessType inst)
-> ConstantEvalResult {
if (auto facet_value = context.insts().TryGetAs<SemIR::FacetValue>(
inst.facet_value_inst_id)) {
auto facet = context.insts().Get(inst.facet_value_inst_id);
CARBON_CHECK(context.types().Is<SemIR::FacetType>(facet.type_id()));
// If the facet is a `type`, we can evaluate to the facet.
if (facet.type_id() == SemIR::TypeType::TypeId) {
return ConstantEvalResult::Existing(
context.constant_values().Get(inst.facet_value_inst_id));
}
// If the facet is a FacetValue, it wraps a `type`, and we can evaluate to
// that `type`.
if (auto facet_value = facet.TryAs<SemIR::FacetValue>()) {
return ConstantEvalResult::Existing(
context.constant_values().Get(facet_value->type_inst_id));
}
// The `facet_value_inst_id` is always a facet value (has type facet type).
CARBON_CHECK(context.types().Is<SemIR::FacetType>(
context.insts().Get(inst.facet_value_inst_id).type_id()));
// Other instructions (e.g. ImplWitnessAccess) of type FacetType can appear
// here, in which case the constant inst is a FacetAccessType until those
// Other instructions (e.g. ImplWitnessAccess) of type `FacetType` can appear
// here, in which case the constant inst is a `FacetAccessType` until those
// instructions resolve to one of the above.
return ConstantEvalResult::NewSamePhase(inst);
}
auto EvalConstantInst(Context& context, SemIR::FacetValue inst)
-> ConstantEvalResult {
// If the FacetValue is of type `type`, then it evaluates to the type inside
// it.
if (inst.type_id == SemIR::TypeType::TypeId) {
return ConstantEvalResult::Existing(
context.constant_values().Get(inst.type_inst_id));
}
// A FacetValue that just wraps a facet without adding/removing any witnesses
// (which means they have the same type) is evaluated to the facet itself.
if (auto access =
@@ -296,7 +309,7 @@ static auto TryFindValueInRewriteConstraints(
SemIR::ElementIndex interface_index, SemIR::InstId search_facet)
-> SemIR::ConstantId {
auto access_self_type_id = context.insts().Get(search_facet).type_id();
if (context.types().Is<SemIR::TypeType>(access_self_type_id)) {
if (access_self_type_id == SemIR::TypeType::TypeId) {
// A self facet of type `type` has no rewrite constraints to look in.
return SemIR::ConstantId::None;
}