Skip to content

Add unit tagging to CustomLayoutId #6271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 27, 2025
Merged

Add unit tagging to CustomLayoutId #6271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f45e5ef
Add unit tagging to CustomLayoutId
dwblaikie Oct 23, 2025
2e94e2f
Merge branch 'trunk' into idtag_custom_layout_id
dwblaikie Oct 27, 2025
196be19
Fix merge
dwblaikie Oct 27, 2025
ea03be3
Merge branch 'trunk' into idtag_custom_layout_id
dwblaikie Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions toolchain/check/testdata/basics/raw_sem_ir/cpp_interop.carbon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ fn G(x: Cpp.X) {
// CHECK:STDOUT: inst6000001F: {kind: PointerType, arg0: inst60000013, type: type(TypeType)}
// CHECK:STDOUT: inst60000020: {kind: UnboundElementType, arg0: inst60000013, arg1: inst6000001F, type: type(TypeType)}
// CHECK:STDOUT: inst60000021: {kind: FieldDecl, arg0: name00000006, arg1: element0, type: type(inst60000020)}
// CHECK:STDOUT: inst60000022: {kind: CustomLayoutType, arg0: struct_type_fields60000001, arg1: custom_layout00000001, type: type(TypeType)}
// CHECK:STDOUT: inst60000023: {kind: CustomLayoutType, arg0: struct_type_fields60000002, arg1: custom_layout00000001, type: type(TypeType)}
// CHECK:STDOUT: inst60000022: {kind: CustomLayoutType, arg0: struct_type_fields60000001, arg1: custom_layout60000001, type: type(TypeType)}
// CHECK:STDOUT: inst60000023: {kind: CustomLayoutType, arg0: struct_type_fields60000002, arg1: custom_layout60000001, type: type(TypeType)}
// CHECK:STDOUT: inst60000024: {kind: CompleteTypeWitness, arg0: inst60000022, type: type(inst(WitnessType))}
// CHECK:STDOUT: inst60000025: {kind: CompleteTypeWitness, arg0: inst60000023, type: type(inst(WitnessType))}
// CHECK:STDOUT: inst60000026: {kind: PointerType, arg0: inst60000023, type: type(TypeType)}
Expand Down
4 changes: 3 additions & 1 deletion toolchain/sem_ir/file.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ File::File(const Parse::Tree* parse_tree, CheckIRId check_ir_id,
constant_values_(ConstantId::NotConstant, &insts_),
inst_blocks_(allocator_, check_ir_id),
constants_(this),
// 1 reserved id for `StructTypeFields::Empty`.
// 1 reserved id for `StructTypeFieldsId::Empty`.
struct_type_fields_(allocator_, IdTag(check_ir_id.index, 1)),
// 1 reserved id for `CustomLayoutId::Empty`.
custom_layouts_(allocator_, IdTag(check_ir_id.index, 1)),
expr_regions_(check_ir_id),
clang_source_locs_(check_ir_id) {
// `type` and the error type are both complete & concrete types.
Expand Down
Loading