carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +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/testdata/interop/cpp/class/import/class.carbon
Vendored
+9
View File
@@ -255,6 +255,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) {
// CHECK:STDOUT: --- import_declaration.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: type: type = facet_type <type> [concrete]
// CHECK:STDOUT: %DeclBar: type = class_type @DeclBar [concrete]
// CHECK:STDOUT: %ptr: type = ptr_type %DeclBar [concrete]
// CHECK:STDOUT: %pattern_type: type = pattern_type %ptr [concrete]
@@ -292,6 +293,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) {
// CHECK:STDOUT: --- import_definition.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: type: type = facet_type <type> [concrete]
// CHECK:STDOUT: %DefBar: type = class_type @DefBar [concrete]
// CHECK:STDOUT: %ptr: type = ptr_type %DefBar [concrete]
// CHECK:STDOUT: %pattern_type: type = pattern_type %ptr [concrete]
@@ -329,6 +331,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) {
// CHECK:STDOUT: --- import_declaration_and_definition.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: type: type = facet_type <type> [concrete]
// CHECK:STDOUT: %DeclDefBar: type = class_type @DeclDefBar [concrete]
// CHECK:STDOUT: %ptr: type = ptr_type %DeclDefBar [concrete]
// CHECK:STDOUT: %pattern_type: type = pattern_type %ptr [concrete]
@@ -366,6 +369,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) {
// CHECK:STDOUT: --- import_static_member_function.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: type: type = facet_type <type> [concrete]
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
// CHECK:STDOUT: %StaticMemberFnBar: type = class_type @StaticMemberFnBar [concrete]
// CHECK:STDOUT: %StaticMemberFnBar.foo.cpp_overload_set.type: type = cpp_overload_set_type @StaticMemberFnBar.foo.cpp_overload_set [concrete]
@@ -396,6 +400,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) {
// CHECK:STDOUT: --- import_static_data_member.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: type: type = facet_type <type> [concrete]
// CHECK:STDOUT: %StaticDataMemberBar: type = class_type @StaticDataMemberBar [concrete]
// CHECK:STDOUT: %ptr.a89: type = ptr_type %StaticDataMemberBar [concrete]
// CHECK:STDOUT: %pattern_type: type = pattern_type %ptr.a89 [concrete]
@@ -436,6 +441,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) {
// CHECK:STDOUT: --- import_data_member.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: type: type = facet_type <type> [concrete]
// CHECK:STDOUT: %DataMemberBar: type = class_type @DataMemberBar [concrete]
// CHECK:STDOUT: %ptr.ec1: type = ptr_type %DataMemberBar [concrete]
// CHECK:STDOUT: %pattern_type: type = pattern_type %ptr.ec1 [concrete]
@@ -492,6 +498,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) {
// CHECK:STDOUT: --- call_dynamic.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: type: type = facet_type <type> [concrete]
// CHECK:STDOUT: %DynamicBar: type = class_type @DynamicBar [concrete]
// CHECK:STDOUT: %ptr.077: type = ptr_type %DynamicBar [concrete]
// CHECK:STDOUT: %pattern_type.e8d: type = pattern_type %ptr.077 [concrete]
@@ -554,6 +561,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) {
// CHECK:STDOUT: --- import_to_inherit_public.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: type: type = facet_type <type> [concrete]
// CHECK:STDOUT: %Derived: type = class_type @Derived [concrete]
// CHECK:STDOUT: %ToInheritBar: type = class_type @ToInheritBar [concrete]
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
@@ -608,6 +616,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) {
// CHECK:STDOUT: --- import_template.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: type: type = facet_type <type> [concrete]
// CHECK:STDOUT: %TemplateBar.type: type = cpp_type_template_type TemplateBar [concrete]
// CHECK:STDOUT: %TemplateBar.template: %TemplateBar.type = struct_value () [concrete]
// CHECK:STDOUT: %X: type = class_type @X [concrete]