Skip to content

Commit c9ce1de

Browse files
committed
Sema: exclude sentinel from source array length in pointer cast to slice
Resolves: #24569
1 parent fc4b7c9 commit c9ce1de

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

src/Sema.zig

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22483,11 +22483,18 @@ fn ptrCastFull(
2248322483
.slice => {},
2248422484
.many, .c, .one => break :len null,
2248522485
}
22486-
// `null` means the operand is a runtime-known slice (so the length is runtime-known).
22487-
const opt_src_len: ?u64 = switch (src_info.flags.size) {
22488-
.one => 1,
22489-
.slice => src_len: {
22490-
const operand_val = try sema.resolveValue(operand) orelse break :src_len null;
22486+
// A `null` length means the operand is a runtime-known slice (so the length is runtime-known).
22487+
// `src_elem_type` is different from `src_info.child` if the latter is an array, to ensure we ignore sentinels.
22488+
const src_elem_ty: Type, const opt_src_len: ?u64 = switch (src_info.flags.size) {
22489+
.one => src: {
22490+
const true_child: Type = .fromInterned(src_info.child);
22491+
break :src switch (true_child.zigTypeTag(zcu)) {
22492+
.array => .{ true_child.childType(zcu), true_child.arrayLen(zcu) },
22493+
else => .{ true_child, 1 },
22494+
};
22495+
},
22496+
.slice => src: {
22497+
const operand_val = try sema.resolveValue(operand) orelse break :src .{ .fromInterned(src_info.child), null };
2249122498
if (operand_val.isUndef(zcu)) break :len .undef;
2249222499
const slice_val = switch (operand_ty.zigTypeTag(zcu)) {
2249322500
.optional => operand_val.optionalValue(zcu) orelse break :len .undef,
@@ -22496,14 +22503,13 @@ fn ptrCastFull(
2249622503
};
2249722504
const slice_len_resolved = try sema.resolveLazyValue(.fromInterned(zcu.intern_pool.sliceLen(slice_val.toIntern())));
2249822505
if (slice_len_resolved.isUndef(zcu)) break :len .undef;
22499-
break :src_len slice_len_resolved.toUnsignedInt(zcu);
22506+
break :src .{ .fromInterned(src_info.child), slice_len_resolved.toUnsignedInt(zcu) };
2250022507
},
2250122508
.many, .c => {
2250222509
return sema.fail(block, src, "cannot infer length of slice from {s}", .{pointerSizeString(src_info.flags.size)});
2250322510
},
2250422511
};
2250522512
const dest_elem_ty: Type = .fromInterned(dest_info.child);
22506-
const src_elem_ty: Type = .fromInterned(src_info.child);
2250722513
if (dest_elem_ty.toIntern() == src_elem_ty.toIntern()) {
2250822514
break :len if (opt_src_len) |l| .{ .constant = l } else .equal_runtime_src_slice;
2250922515
}
@@ -22519,7 +22525,7 @@ fn ptrCastFull(
2251922525
const bytes = src_len * src_elem_size;
2252022526
const dest_len = std.math.divExact(u64, bytes, dest_elem_size) catch switch (src_info.flags.size) {
2252122527
.slice => return sema.fail(block, src, "slice length '{d}' does not divide exactly into destination elements", .{src_len}),
22522-
.one => return sema.fail(block, src, "type '{f}' does not divide exactly into destination elements", .{src_elem_ty.fmt(pt)}),
22528+
.one => return sema.fail(block, src, "type '{f}' does not divide exactly into destination elements", .{Type.fromInterned(src_info.child).fmt(pt)}),
2252322529
else => unreachable,
2252422530
};
2252522531
break :len .{ .constant = dest_len };

test/behavior/ptrcast.zig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,3 +552,13 @@ test "@ptrCast single-item pointer to slice of bytes" {
552552
try comptime S.doTheTest(void, &{});
553553
try comptime S.doTheTest(struct { x: u32 }, &.{ .x = 123 });
554554
}
555+
556+
test "@ptrCast array pointer removing sentinel" {
557+
const in: *const [4:0]u8 = &.{ 1, 2, 3, 4 };
558+
const out: []const i8 = @ptrCast(in);
559+
comptime assert(out.len == 4);
560+
comptime assert(out[0] == 1);
561+
comptime assert(out[1] == 2);
562+
comptime assert(out[2] == 3);
563+
comptime assert(out[3] == 4);
564+
}

0 commit comments

Comments
 (0)