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

Remove all remaining uses of TypeIds as instruction operands. (#5280)

Browse Source 
In preparation for shifting from `TypeId`s potentially representing
attached types to always representing unattached types, using
[terminology suggested on
Discord](https://discord.com/channels/655572317891461132/963846118964350976/1359286326779973712).
This change causes us to track slightly more type spelling information
through SemIR.

One change that has significant impact on the SemIR output is that we
now build a `struct_type` instruction in each class representing the
types of the fields, including the spelling used for those types. This
is now no longer always identical to the corresponding canonical
`struct_type` for the object representation, so it's built separately
and owned by the class.

Also remove `TypeBlock` support entirely, as its only use was
representing `TupleType`s, which now use an `InstBlock`.
This commit is contained in:
Richard Smith
2025-04-10 20:53:42 +00:00
committed by GitHub
parent 1445ec9e4f
commit a74ca9071b
350 changed files with 1880 additions and 1189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/pattern_match.cpp
+11 -8
View File
@@ -527,15 +527,18 @@ auto MatchContext::DoEmitPatternMatch(Context& context,
auto tuple_type =
context.types().GetAs<SemIR::TupleType>(tuple_pattern.type_id);
auto element_type_ids = context.type_blocks().Get(tuple_type.elements_id);
auto element_type_inst_ids =
context.inst_blocks().Get(tuple_type.elements_id);
llvm::SmallVector<SemIR::InstId> subscrutinee_ids;
subscrutinee_ids.reserve(element_type_ids.size());
for (auto [i, element_type_id] : llvm::enumerate(element_type_ids)) {
subscrutinee_ids.push_back(
AddInst<SemIR::TupleAccess>(context, scrutinee.loc_id,
{.type_id = element_type_id,
.tuple_id = entry.scrutinee_id,
.index = SemIR::ElementIndex(i)}));
subscrutinee_ids.reserve(element_type_inst_ids.size());
for (auto [i, element_type_inst_id] :
llvm::enumerate(element_type_inst_ids)) {
subscrutinee_ids.push_back(AddInst<SemIR::TupleAccess>(
context, scrutinee.loc_id,
{.type_id =
context.types().GetTypeIdForTypeInstId(element_type_inst_id),
.tuple_id = entry.scrutinee_id,
.index = SemIR::ElementIndex(i)}));
}
add_all_subscrutinees(subscrutinee_ids);
}