mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix hasRuntimeBitsAdvanced lazy case for pointers and optionals

Browse Source 
As suggested by mlugg, always returns `error.NeedLazy`. If this has a
performance impact, it could be replaced by adding lazy handling to
`comptimeOnlyAdvanced`.
This commit is contained in:
DilithiumNitrate 2023-10-29 22:12:43 +01:00 committed by GitHub
parent fa022d1ecc
commit 91e117697a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/type.zig
View File

@ -473,8 +473,11 @@ pub const Type = struct {
// Pointers to zero-bit types still have a runtime address; however, pointers
// to comptime-only types do not, with the exception of function pointers.
if (ignore_comptime_only) return true;
if (strat == .sema) return !(try strat.sema.typeRequiresComptime(ty));
return !comptimeOnly(ty, mod);
return switch (strat) {
.sema => |sema| !(try sema.typeRequiresComptime(ty)),
.eager => !comptimeOnly(ty, mod),
.lazy => error.NeedLazy,
};
},
.anyframe_type => true,
.array_type => |array_type| {
@ -495,13 +498,12 @@ pub const Type = struct {
// Then the optional is comptime-known to be null.
return false;
}
if (ignore_comptime_only) {
return true;
} else if (strat == .sema) {
return !(try strat.sema.typeRequiresComptime(child_ty));
} else {
return !comptimeOnly(child_ty, mod);
}
if (ignore_comptime_only) return true;
return switch (strat) {
.sema => |sema| !(try sema.typeRequiresComptime(child_ty)),
.eager => !comptimeOnly(child_ty, mod),
.lazy => error.NeedLazy,
};
},
.error_union_type,
.error_set_type,

19
test/behavior/struct.zig
View File

@ -1766,3 +1766,22 @@ test "pointer to struct initialized through reference to anonymous initializer p
const str: *const [5]u8 = @ptrCast(s.c);
try std.testing.expectEqualSlices(u8, "hello", str);
}
test "comptimeness of optional and error union payload is analyzed properly" {
// This is primarily a semantic analysis integrity test.
// The original failure mode for this was a crash.
// Both structs and unions work for this, the point is that
// their comptimeness is lazily evaluated.
const S = struct {};
// Original form of bug #17511, regressed in #17471
const a = @sizeOf(?*S);
_ = a;
// Error union case, fails assertion in debug versions of release 0.11.0
_ = @sizeOf(anyerror!*S);
_ = @sizeOf(anyerror!?S);
// Evaluation case, crashes the actual release 0.11.0
const C = struct { x: comptime_int };
const c: anyerror!?C = .{ .x = 3 };
const x = (try c).?.x;
try std.testing.expectEqual(3, x);
}