Skip to content

Sema: ensure slice_ptr produces the correct type #18347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewrk merged 2 commits into from
Dec 23, 2023
Merged

Sema: ensure slice_ptr produces the correct type #18347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d312665
Sema: ensure `slice_ptr` produces the correct type
jacobly0 Dec 23, 2023
5c2897e
cbe: fix memory leaks
jacobly0 Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/Sema.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24311,7 +24311,8 @@ fn analyzeMinMax(

fn upgradeToArrayPtr(sema: *Sema, block: *Block, ptr: Air.Inst.Ref, len: u64) !Air.Inst.Ref {
const mod = sema.mod;
const info = sema.typeOf(ptr).ptrInfo(mod);
const ptr_ty = sema.typeOf(ptr);
const info = ptr_ty.ptrInfo(mod);
if (info.flags.size == .One) {
// Already an array pointer.
return ptr;
Expand All @@ -24330,10 +24331,11 @@ fn upgradeToArrayPtr(sema: *Sema, block: *Block, ptr: Air.Inst.Ref, len: u64) !A
.address_space = info.flags.address_space,
},
});
if (info.flags.size == .Slice) {
return block.addTyOp(.slice_ptr, new_ty, ptr);
}
return block.addBitCast(new_ty, ptr);
const non_slice_ptr = if (info.flags.size == .Slice)
try block.addTyOp(.slice_ptr, ptr_ty.slicePtrFieldType(mod), ptr)
else
ptr;
return block.addBitCast(new_ty, non_slice_ptr);
}

fn zirMemcpy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!void {
Expand Down
2 changes: 2 additions & 0 deletions src/link/C.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ pub fn deinit(self: *C) void {
self.string_bytes.deinit(gpa);
self.fwd_decl_buf.deinit(gpa);
self.code_buf.deinit(gpa);
self.lazy_fwd_decl_buf.deinit(gpa);
self.lazy_code_buf.deinit(gpa);
}

pub fn freeDecl(self: *C, decl_index: InternPool.DeclIndex) void {
Expand Down
21 changes: 21 additions & 0 deletions test/behavior/memcpy.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,27 @@ fn testMemcpyDestManyPtr() !void {
try expect(buf[4] == 'o');
}

test "@memcpy slice" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;

try testMemcpySlice();
try comptime testMemcpySlice();
}

fn testMemcpySlice() !void {
var buf: [5]u8 = undefined;
const dst: []u8 = &buf;
const src: []const u8 = "hello";
@memcpy(dst, src);
try expect(buf[0] == 'h');
try expect(buf[1] == 'e');
try expect(buf[2] == 'l');
try expect(buf[3] == 'l');
try expect(buf[4] == 'o');
}

comptime {
const S = struct {
buffer: [8]u8 = undefined,
Expand Down