Skip to content

Commit 1433dbd

Browse files
committed
Sema: use elemPtrOneLayerOnly in zirMemCpy
Closes ziglang#15633
1 parent 440b7ca commit 1433dbd

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

src/Sema.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22138,7 +22138,7 @@ fn zirMemcpy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!void
2213822138
const len = try sema.usizeCast(block, dest_src, len_u64);
2213922139
for (0..len) |i| {
2214022140
const elem_index = try sema.addIntUnsigned(Type.usize, i);
22141-
const dest_elem_ptr = try sema.elemPtr(
22141+
const dest_elem_ptr = try sema.elemPtrOneLayerOnly(
2214222142
block,
2214322143
src,
2214422144
dest_ptr,
@@ -22147,7 +22147,7 @@ fn zirMemcpy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!void
2214722147
true, // init
2214822148
false, // oob_safety
2214922149
);
22150-
const src_elem_ptr = try sema.elemPtr(
22150+
const src_elem_ptr = try sema.elemPtrOneLayerOnly(
2215122151
block,
2215222152
src,
2215322153
src_ptr,

test/behavior/memcpy.zig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,16 @@ test "@memcpy dest many pointer" {
5555
try expect(buf[3] == 'l');
5656
try expect(buf[4] == 'o');
5757
}
58+
59+
comptime {
60+
const S = struct {
61+
buffer: [8]u8 = undefined,
62+
fn set(self: *@This(), items: []const u8) void {
63+
@memcpy(self.buffer[0..items.len], items);
64+
}
65+
};
66+
67+
var s = S{};
68+
s.set("hello");
69+
if (!std.mem.eql(u8, s.buffer[0..5], "hello")) @compileError("bad");
70+
}

0 commit comments

Comments
 (0)