Merge pull request #15481 from ziglang/use-mem-intrinsics

actually use the new memory intrinsics

1 files changed, 5 insertions, 3 deletions

diff --git a/src/arch/x86_64/Encoding.zig b/src/arch/x86_64/Encoding.zig
index 21899b912b..a977af7842 100644
--- a/src/arch/x86_64/Encoding.zig
+++ b/src/arch/x86_64/Encoding.zig
@@ -546,7 +546,7 @@ fn estimateInstructionLength(prefix: Prefix, encoding: Encoding, ops: []const Op
         .encoding = encoding,
         .ops = [1]Operand{.none} ** 4,
     };
-    std.mem.copy(Operand, &inst.ops, ops);
+    @memcpy(inst.ops[0..ops.len], ops);
 
     var cwriter = std.io.countingWriter(std.io.null_writer);
     inst.encode(cwriter.writer(), .{ .allow_frame_loc = true }) catch unreachable; // Not allowed to fail here unless OOM.
@@ -575,8 +575,10 @@ const mnemonic_to_encodings_map = init: {
             .modrm_ext = entry[4],
             .mode = entry[5],
         };
-        std.mem.copy(Op, &data.ops, entry[2]);
-        std.mem.copy(u8, &data.opc, entry[3]);
+        // TODO: use `@memcpy` for these. When I did that, I got a false positive
+        // compile error for this copy happening at compile time.
+        std.mem.copyForwards(Op, &data.ops, entry[2]);
+        std.mem.copyForwards(u8, &data.opc, entry[3]);
 
         while (mnemonic_int < @enumToInt(entry[0])) : (mnemonic_int += 1) {
             mnemonic_map[mnemonic_int] = data_storage[mnemonic_start..data_index];