authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-04-29 13:48:15-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-04-29 13:48:15-04:00
log4b6f350369d1a27353f521c25fd938b6232b631a
tree5fe5f4e0d02d99ce882360cc5efea88b42ca0f94
parent3c13aa178b007cae19800579b40e82bef127f388
signaturelock-open Commit is signed but in an unrecognized format.

DirectAllocator: move if > 0 condition above @memcpy

Minor improvement to 3c13aa17 as noted by daurnimator

1 files changed, 2 insertions(+), 2 deletions(-)

std/heap.zig+2-2
...@@ -141,8 +141,8 @@ pub const DirectAllocator = struct {...@@ -141,8 +141,8 @@ pub const DirectAllocator = struct {
141 return shrink(allocator, old_mem, old_align, new_size, new_align);141 return shrink(allocator, old_mem, old_align, new_size, new_align);
142 }142 }
143 const result = try alloc(allocator, new_size, new_align);143 const result = try alloc(allocator, new_size, new_align);
144 @memcpy(result.ptr, old_mem.ptr, std.math.min(old_mem.len, result.len));144 if (old_mem.len != 0) {
145 if (old_mem.len > 0) {145 @memcpy(result.ptr, old_mem.ptr, std.math.min(old_mem.len, result.len));
146 _ = os.posix.munmap(@ptrToInt(old_mem.ptr), old_mem.len);146 _ = os.posix.munmap(@ptrToInt(old_mem.ptr), old_mem.len);
147 }147 }
148 return result;148 return result;