mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Type: resolve union tag type before checking for runtime bits

Browse Source
This commit is contained in:
David Rubin 2025-01-29 18:17:27 -08:00 committed by Andrew Kelley
parent a502301b5e
commit 84aac8b6c7
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Type.zig
View File

@ -604,21 +604,7 @@ pub fn hasRuntimeBitsInner(
// and then later if our guess was incorrect, we emit a compile error.
if (union_type.assumeRuntimeBitsIfFieldTypesWip(ip)) return true;
},
.safety, .tagged => {
const tag_ty = union_type.tagTypeUnordered(ip);
// tag_ty will be `none` if this union's tag type is not resolved yet,
// in which case we want control flow to continue down below.
if (tag_ty != .none and
try Type.fromInterned(tag_ty).hasRuntimeBitsInner(
ignore_comptime_only,
strat,
zcu,
tid,
))
{
return true;
}
},
.safety, .tagged => {},
}
switch (strat) {
.sema => try ty.resolveFields(strat.pt(zcu, tid)),
@ -626,6 +612,21 @@ pub fn hasRuntimeBitsInner(
.lazy => if (!union_flags.status.haveFieldTypes())
return error.NeedLazy,
}
switch (union_flags.runtime_tag) {
.none => {},
.safety, .tagged => {
const tag_ty = union_type.tagTypeUnordered(ip);
assert(tag_ty != .none); // tag_ty should have been resolved above
if (try Type.fromInterned(tag_ty).hasRuntimeBitsInner(
ignore_comptime_only,
strat,
zcu,
tid,
)) {
return true;
}
},
}
for (0..union_type.field_types.len) |field_index| {
const field_ty = Type.fromInterned(union_type.field_types.get(ip)[field_index]);
if (try field_ty.hasRuntimeBitsInner(ignore_comptime_only, strat, zcu, tid))

8
test/behavior/eval.zig
View File

@ -1360,6 +1360,14 @@ test "lazy sizeof is resolved in division" {
try expect(@sizeOf(A) - a == 2);
}
test "lazy sizeof union tag size in compare" {
const A = union(enum) {
a: void,
b: void,
};
try expect(@sizeOf(A) == 1);
}
test "lazy value is resolved as slice operand" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO