mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
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:
@@ -38,6 +38,7 @@
|
||||
#include "toolchain/sem_ir/inst_kind.h"
|
||||
#include "toolchain/sem_ir/name_scope.h"
|
||||
#include "toolchain/sem_ir/observe.h"
|
||||
#include "toolchain/sem_ir/singleton_insts.h"
|
||||
#include "toolchain/sem_ir/specific_interface.h"
|
||||
#include "toolchain/sem_ir/specific_named_constraint.h"
|
||||
#include "toolchain/sem_ir/type_info.h"
|
||||
@@ -4578,8 +4579,9 @@ static auto TryResolveInstCanonical(ImportRefResolver& resolver,
|
||||
"Constant value of constant instruction should refer to "
|
||||
"the same instruction");
|
||||
|
||||
if (SemIR::IsSingletonInstId(constant_inst_id)) {
|
||||
// Constants for builtins can be directly copied.
|
||||
if (SemIR::IsSingletonInstId(constant_inst_id) ||
|
||||
constant_inst_id == SemIR::TypeType::TypeInstId) {
|
||||
// Constants for singletons and TypeType can be directly copied.
|
||||
return ResolveResult::Done(
|
||||
resolver.local_constant_values().Get(constant_inst_id));
|
||||
}
|
||||
@@ -4985,15 +4987,21 @@ auto ImportRefResolver::ResolveType(SemIR::TypeId import_type_id)
|
||||
auto import_type_const_id = import_ir().types().GetConstantId(import_type_id);
|
||||
CARBON_CHECK(import_type_const_id.has_value());
|
||||
|
||||
if (auto import_type_inst_id = import_ir().types().GetAsTypeInstId(
|
||||
import_ir().constant_values().GetInstId(import_type_const_id));
|
||||
SemIR::IsSingletonInstId(import_type_inst_id)) {
|
||||
// Builtins don't require constant resolution; we can use them directly.
|
||||
auto import_type_inst_id = import_ir().types().GetAsTypeInstId(
|
||||
import_ir().constant_values().GetInstId(import_type_const_id));
|
||||
|
||||
// Builtin types don't require constant resolution; we can use them directly.
|
||||
if (SemIR::IsSingletonInstId(import_type_inst_id)) {
|
||||
// Singletons are all types, and need to go through GetSingletonType to
|
||||
// complete them.
|
||||
return GetSingletonType(local_context(), import_type_inst_id);
|
||||
} else {
|
||||
return local_types().GetTypeIdForTypeConstantId(
|
||||
ResolveConstant(import_type_id.AsConstantId()));
|
||||
} else if (import_type_inst_id == SemIR::TypeType::TypeInstId) {
|
||||
// TypeType is the other builtin type, and is already complete.
|
||||
return SemIR::TypeType::TypeId;
|
||||
}
|
||||
|
||||
return local_types().GetTypeIdForTypeConstantId(
|
||||
ResolveConstant(import_type_id.AsConstantId()));
|
||||
}
|
||||
|
||||
auto ImportRefResolver::HasNewWork() -> bool {
|
||||
|
||||
Reference in New Issue
Block a user