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

Preserve type sugar in ArrayType, ConstType, and PointerType. (#5235)

Browse Source 
Each of these types takes another type as an operand. Instead of storing
that other type as a `TypeId`, store it as an `InstId` so that we can
track how it was written, not only its canonical form.

The canonical constant values of these types continue to store the
canonical constant values of their operands, as normal.

---------

Co-authored-by: Dana Jansens <danakj@orodu.net>
This commit is contained in:
Richard Smith
2025-04-03 21:14:03 +00:00
committed by GitHub
co-authored by Dana Jansens
parent 164310c6b8
commit bba32900c3
141 changed files with 535 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_array.cpp
+7 -6
View File
@@ -31,8 +31,8 @@ auto HandleParseNode(Context& context, Parse::ArrayExprId node_id) -> bool {
auto [element_type_node_id, element_type_inst_id] =
context.node_stack().PopExprWithNodeId();
auto element_type_id =
ExprAsType(context, element_type_node_id, element_type_inst_id).type_id;
auto element_type =
ExprAsType(context, element_type_node_id, element_type_inst_id);
// The array bound must be a constant. Diagnose this prior to conversion
// because conversion to `IntLiteral` will produce a generic "non-constant
@@ -50,10 +50,11 @@ auto HandleParseNode(Context& context, Parse::ArrayExprId node_id) -> bool {
bound_inst_id = ConvertToValueOfType(
context, context.insts().GetLocId(bound_inst_id), bound_inst_id,
GetSingletonType(context, SemIR::IntLiteralType::SingletonInstId));
AddInstAndPush<SemIR::ArrayType>(context, node_id,
{.type_id = SemIR::TypeType::SingletonTypeId,
.bound_id = bound_inst_id,
.element_type_id = element_type_id});
AddInstAndPush<SemIR::ArrayType>(
context, node_id,
{.type_id = SemIR::TypeType::SingletonTypeId,
.bound_id = bound_inst_id,
.element_type_inst_id = element_type.inst_id});
return true;
}