motiejus/zig
1
Fork 0
Code Releases Activity

stage2: implement intTagType logic

Browse Source 
This commit changes a lot of `*const Module` to `*Module` to make it
work, since accessing the integer tag type of an enum might need to
mutate the InternPool by adding a new integer type into it.

An alternate strategy would be to pre-heat the InternPool with the
integer tag type when creating an enum type, which would make it so that
intTagType could accept a const Module instead of a mutable one,
asserting that the InternPool already had the integer tag type.
This commit is contained in:
Andrew Kelley
2023-05-07 15:38:31 -07:00
parent a5fb169594
commit 4d88f825bc
19 changed files with 136 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/codegen.zig
View File

@@ -1241,7 +1241,7 @@ pub fn genTypedValue(
if (enum_values.count() != 0) {
const tag_val = enum_values.keys()[field_index.data];
return genTypedValue(bin_file, src_loc, .{
.ty = typed_value.ty.intTagType(),
.ty = try typed_value.ty.intTagType(mod),
.val = tag_val,
}, owner_decl_index);
} else {
@@ -1251,7 +1251,7 @@ pub fn genTypedValue(
else => unreachable,
}
} else {
const int_tag_ty = typed_value.ty.intTagType();
const int_tag_ty = try typed_value.ty.intTagType(mod);
return genTypedValue(bin_file, src_loc, .{
.ty = int_tag_ty,
.val = typed_value.val,
@@ -1303,7 +1303,7 @@ pub fn genTypedValue(
return genUnnamedConst(bin_file, src_loc, typed_value, owner_decl_index);
}
pub fn errUnionPayloadOffset(payload_ty: Type, mod: *const Module) u64 {
pub fn errUnionPayloadOffset(payload_ty: Type, mod: *Module) u64 {
if (!payload_ty.hasRuntimeBitsIgnoreComptime(mod)) return 0;
const payload_align = payload_ty.abiAlignment(mod);
const error_align = Type.anyerror.abiAlignment(mod);
@@ -1314,7 +1314,7 @@ pub fn errUnionPayloadOffset(payload_ty: Type, mod: *const Module) u64 {
}
}
pub fn errUnionErrorOffset(payload_ty: Type, mod: *const Module) u64 {
pub fn errUnionErrorOffset(payload_ty: Type, mod: *Module) u64 {
if (!payload_ty.hasRuntimeBitsIgnoreComptime(mod)) return 0;
const payload_align = payload_ty.abiAlignment(mod);
const error_align = Type.anyerror.abiAlignment(mod);