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

Sema: fix loading and storing of optional pointers represented as pointers

Browse Source
This commit is contained in:
Veikka Tuominen 2022-07-22 17:01:57 +03:00
parent 393d59bb72
commit c619371ec1
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Sema.zig
View File

@ -22625,7 +22625,9 @@ fn beginComptimePtrMutation(
}
},
.opt_payload_ptr => {
const opt_ptr = ptr_val.castTag(.opt_payload_ptr).?.data;
const opt_ptr = if (ptr_val.castTag(.opt_payload_ptr)) |some| some.data else {
return sema.beginComptimePtrMutation(block, src, ptr_val, try ptr_elem_ty.optionalChildAlloc(sema.arena));
};
var parent = try beginComptimePtrMutation(sema, block, src, opt_ptr.container_ptr, opt_ptr.container_ty);
switch (parent.pointee) {
.direct => |val_ptr| {
@ -22941,7 +22943,7 @@ fn beginComptimePtrLoad(
if (coerce_in_mem_ok) {
const payload_val = switch (ptr_val.tag()) {
.eu_payload_ptr => tv.val.castTag(.eu_payload).?.data,
.opt_payload_ptr => tv.val.castTag(.opt_payload).?.data,
.opt_payload_ptr => if (tv.val.castTag(.opt_payload)) |some| some.data else tv.val,
else => unreachable,
};
tv.* = TypedValue{ .ty = payload_ty, .val = payload_val };

10
test/behavior/eval.zig
View File

@ -1272,3 +1272,13 @@ test "continue nested in a conditional in an inline for" {
}
try expect(x == 0);
}
test "optional pointer represented as a pointer value" {
comptime {
var val: u8 = 15;
const opt_ptr: ?*u8 = &val;
const payload_ptr = &opt_ptr.?;
try expect(payload_ptr.*.* == 15);
}
}