Skip to content

Commit 515c970

Browse files
committed
Revert "work around llvm failing to lower memcpy"
This reverts commit acf7043. Fixed as of ec768b7.
1 parent 9758371 commit 515c970

File tree

1 file changed

+2
-26
lines changed

1 file changed

+2
-26
lines changed

lib/compiler_rt/memcpy.zig

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,12 @@ comptime {
99
}
1010
}
1111

12-
const llvm_cannot_lower = switch (builtin.cpu.arch) {
13-
.arm, .armeb, .thumb, .thumbeb => builtin.zig_backend == .stage2_llvm,
14-
else => false,
15-
};
16-
1712
fn memcpy(noalias opt_dest: ?[*]u8, noalias opt_src: ?[*]const u8, len: usize) callconv(.C) ?[*]u8 {
18-
if (llvm_cannot_lower) {
19-
for (0..len) |i| opt_dest.?[i] = opt_src.?[i];
20-
return opt_dest;
21-
} else {
22-
return memmove(opt_dest, opt_src, len);
23-
}
13+
return memmove(opt_dest, opt_src, len);
2414
}
2515

26-
/// A port of https://github.com/facebook/folly/blob/1c8bc50e88804e2a7361a57cd9b551dd10f6c5fd/folly/memcpy.S
2716
fn memmove(opt_dest: ?[*]u8, opt_src: ?[*]const u8, len: usize) callconv(.C) ?[*]u8 {
28-
if (llvm_cannot_lower) {
29-
if (@intFromPtr(opt_dest) < @intFromPtr(opt_src)) {
30-
for (0..len) |i| opt_dest.?[i] = opt_src.?[i];
31-
return opt_dest;
32-
} else {
33-
var index = len;
34-
while (index != 0) {
35-
index -= 1;
36-
opt_dest.?[index] = opt_src.?[index];
37-
}
38-
return opt_dest;
39-
}
40-
}
41-
17+
// a port of https://github.com/facebook/folly/blob/1c8bc50e88804e2a7361a57cd9b551dd10f6c5fd/folly/memcpy.S
4218
if (len == 0) {
4319
@branchHint(.unlikely);
4420
return opt_dest;

0 commit comments

Comments
 (0)