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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/type.cpp
+15 -8
View File
@@ -4,6 +4,7 @@
#include "toolchain/check/type.h"
#include "toolchain/check/control_flow.h"
#include "toolchain/check/eval.h"
#include "toolchain/check/facet_type.h"
#include "toolchain/check/inst.h"
@@ -283,7 +284,7 @@ auto GetUnboundElementType(Context& context, SemIR::TypeInstId class_type_id,
element_type_id);
}
auto GetCanonicalFacetOrTypeValue(Context& context, SemIR::InstId inst_id)
auto GetCanonicalFacet(Context& context, SemIR::InstId inst_id)
-> SemIR::InstId {
auto const_inst_id = context.constant_values().GetConstantInstId(inst_id);
CARBON_DCHECK(const_inst_id.has_value());
@@ -296,23 +297,29 @@ auto GetCanonicalFacetOrTypeValue(Context& context, SemIR::InstId inst_id)
return const_inst_id;
}
auto GetCanonicalFacetOrTypeValue(Context& context, SemIR::ConstantId const_id)
auto GetCanonicalFacet(Context& context, SemIR::ConstantId const_id)
-> SemIR::ConstantId {
return context.constant_values().Get(GetCanonicalFacetOrTypeValue(
return context.constant_values().Get(GetCanonicalFacet(
context, context.constant_values().GetInstId(const_id)));
}
auto TryGetCanonicalFacetValue(Context& context, SemIR::InstId inst_id)
auto TryGetCanonicalFacet(Context& context, SemIR::InstId inst_id)
-> SemIR::InstId {
if (context.insts().Get(inst_id).type_id() != SemIR::TypeType::TypeId) {
return SemIR::InstId::None;
}
auto const_id = context.constant_values().Get(inst_id);
if (!const_id.is_constant()) {
auto const_inst_id = context.constant_values().GetConstantInstId(inst_id);
if (!const_inst_id.has_value()) {
return SemIR::InstId::None;
}
return context.constant_values().GetInstId(
GetCanonicalFacetOrTypeValue(context, const_id));
if (auto access =
context.insts().TryGetAs<SemIR::FacetAccessType>(const_inst_id)) {
return access->facet_value_inst_id;
}
return SemIR::InstId::None;
}
} // namespace Carbon::Check