From d312665803c1535da6f36387183bbb2348e4216c Mon Sep 17 00:00:00 2001
From: Jacob Young <jacobly0@users.noreply.github.com>
Date: Sat, 23 Dec 2023 02:08:58 -0500
Subject: [PATCH 1/2] Sema: ensure `slice_ptr` produces the correct type

Closes #18345
---
 src/Sema.zig             | 12 +++++++-----
 test/behavior/memcpy.zig | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/Sema.zig b/src/Sema.zig
index dd492e5394..ee9fa5b062 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -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;
@@ -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 {
diff --git a/test/behavior/memcpy.zig b/test/behavior/memcpy.zig
index 33f6c0f34c..fa9203713d 100644
--- a/test/behavior/memcpy.zig
+++ b/test/behavior/memcpy.zig
@@ -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,

From 5c2897e89fd4730cf18a78d23524bd74cef93962 Mon Sep 17 00:00:00 2001
From: Jacob Young <jacobly0@users.noreply.github.com>
Date: Fri, 22 Dec 2023 11:41:39 -0500
Subject: [PATCH 2/2] cbe: fix memory leaks

---
 src/link/C.zig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/link/C.zig b/src/link/C.zig
index a8721a0c02..85d13bf7ec 100644
--- a/src/link/C.zig
+++ b/src/link/C.zig
@@ -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 {